sync: smoother server checking (fixes #11298) (#11299)

Co-authored-by: dogi <dogi@users.noreply.github.com>

Author: Okuro3499

app/build.gradle

@@ -12,8 +12,8 @@ android {
         applicationId "org.ole.planet.myplanet"
         minSdk = 26
         targetSdk = 36
-        versionCode = 4619
-        versionName = "0.46.19"
+        versionCode = 4620
+        versionName = "0.46.20"
         ndkVersion = '26.3.11579264'
         vectorDrawables.useSupportLibrary = true
     }

app/src/main/java/org/ole/planet/myplanet/repository/ConfigurationsRepositoryImpl.kt

@@ -68,7 +68,7 @@ class ConfigurationsRepositoryImpl @Inject constructor(
                         is java.net.UnknownHostException -> "Server not reachable"
                         is java.net.SocketTimeoutException -> "Connection timeout"
                         is java.net.ConnectException -> "Unable to connect to server"
-                        is java.io.IOException -> "Network connection error"
+                        is IOException -> "Network connection error"
                         else -> "Network error: ${t.localizedMessage ?: "Unknown error"}"
                     }
                     withContext(Dispatchers.Main) { listener.onSuccess(errorMsg) }
@@ -171,7 +171,7 @@ class ConfigurationsRepositoryImpl @Inject constructor(
             val alternativeReachable = mapping.alternativeUrl?.let { checkServerAvailability(it) } == true
 
             if (!primaryReachable && alternativeReachable) {
-                mapping.alternativeUrl!!.let { alternativeUrl ->
+                mapping.alternativeUrl.let { alternativeUrl ->
                     val uri = updateUrl.toUri()
                     val editor = preferences.edit()
 

app/src/main/java/org/ole/planet/myplanet/services/ConfigurationManager.kt

@@ -34,13 +34,9 @@ class ConfigurationManager(
 ) {
 
     fun getMinApk(
-        listener: DataService.ConfigurationIdListener?,
-        url: String,
-        pin: String,
-        activity: SyncActivity,
-        callerActivity: String
+        listener: DataService.ConfigurationIdListener?, url: String, pin: String,
+        activity: SyncActivity, callerActivity: String
     ) {
-
         val serverUrlMapper = ServerUrlMapper()
         val mapping = serverUrlMapper.processUrl(url)
         val urlsToTry = mutableListOf(url).apply { mapping.alternativeUrl?.let { add(it) } }
@@ -126,8 +122,7 @@ class ConfigurationManager(
 
                     fetchConfiguration(couchdbURL)?.let { (id, code) ->
                         return UrlCheckResult.Success(id, code, currentUrl)
-                    } ?: run {
-                    }
+                    } ?: run {}
                 }
             }
             UrlCheckResult.Failure(currentUrl)

app/src/main/java/org/ole/planet/myplanet/ui/sync/ServerDialogExtensions.kt

@@ -160,7 +160,8 @@ fun SyncActivity.setupServerListUi(binding: DialogServerUrlBinding, dialog: Mate
             val protocol = if (
                 actualUrl == BuildConfig.PLANET_XELA_URL ||
                 actualUrl == BuildConfig.PLANET_SANPABLO_URL ||
-                actualUrl == BuildConfig.PLANET_URIUR_URL
+                actualUrl == BuildConfig.PLANET_URIUR_URL ||
+                isLocalNetwork(actualUrl)
             ) "http://" else "https://"
             editor.putString("serverProtocol", protocol).apply()
             if (serverCheck) {
@@ -210,7 +211,6 @@ fun SyncActivity.setupServerListUi(binding: DialogServerUrlBinding, dialog: Mate
     }
     serverUrl.isEnabled = false
     serverPassword.isEnabled = false
-    editor.putString("serverProtocol", getString(R.string.https_protocol)).apply()
 }
 
 fun SyncActivity.onNeutralButtonClick(dialog: MaterialDialog) {
@@ -330,3 +330,13 @@ fun SyncActivity.setupManualConfigEnabled(binding: DialogServerUrlBinding, dialo
     setUrlAndPin(settings.getBoolean("switchCloudUrl", false))
     protocolSemantics()
 }
+
+private fun isLocalNetwork(url: String): Boolean {
+    val host = url.split(":").firstOrNull()?.split("/")?.firstOrNull() ?: url
+    return host.startsWith("192.168.") ||
+            host.startsWith("10.") ||
+            host.matches(Regex("^172\\.(1[6-9]|2[0-9]|3[0-1])\\..*")) ||
+            host == "localhost" ||
+            host == "127.0.0.1" ||
+            host.endsWith(".local")
+}

app/src/main/java/org/ole/planet/myplanet/ui/sync/SyncActivity.kt

@@ -314,7 +314,8 @@ abstract class SyncActivity : ProcessUserDataActivity(), ConfigurationsRepositor
                 "$processedUrl/_all_dbs"
             }
 
-            if (configurationsRepository.checkServerAvailability(url)) {
+            val isAvailable = configurationsRepository.checkServerAvailability(url)
+            if (isAvailable) {
                 startSync(type)
                 return true
             }

app/src/main/java/org/ole/planet/myplanet/utils/ServerConfigUtils.kt

@@ -4,6 +4,7 @@ import android.content.Context
 import org.ole.planet.myplanet.BuildConfig
 import org.ole.planet.myplanet.R
 import org.ole.planet.myplanet.model.ServerAddress
+import androidx.core.net.toUri
 
 object ServerConfigUtils {
     fun getServerAddresses(context: Context): List<ServerAddress> {
@@ -67,7 +68,7 @@ object ServerConfigUtils {
         settings: android.content.SharedPreferences,
         editor: android.content.SharedPreferences.Editor,
     ): String {
-        val uri = android.net.Uri.parse(url)
+        val uri = url.toUri()
         val (urlUser, urlPwd, couchdbURL) = if (url.contains("@")) {
             val userinfo = org.ole.planet.myplanet.ui.sync.ProcessUserDataActivity.getUserInfo(uri)
             Triple(userinfo[0], userinfo[1], url)

gradle.properties

@@ -51,8 +51,8 @@ PLANET_URIUR_CLONE_URL=uriur.planet.gt
 PLANET_URIUR_CLONE_PIN=4025
 PLANET_RUIRU_URL=192.168.1.93
 PLANET_RUIRU_PIN=8925
-PLANET_EMBAKASI_URL=192.168.1.202
-PLANET_EMBAKASI_PIN=1848
+PLANET_EMBAKASI_URL=192.168.1.148
+PLANET_EMBAKASI_PIN=0963
 PLANET_EMBAKASI_CLONE_URL=embakasi.planet.gt
 PLANET_EMBAKASI_CLONE_PIN=1848
 PLANET_CAMBRIDGE_URL=192.168.68.126