Merge pull request #4487 from kiwix/Fixes#4484

Using the server address provided by libkiwix.

Author: kelson42

app/src/androidTest/java/org/kiwix/kiwixmobile/download/DownloadTest.kt

@@ -38,6 +38,7 @@ import androidx.test.uiautomator.UiDevice
 import com.adevinta.android.barista.interaction.BaristaSleepInteractions
 import com.google.android.apps.common.testing.accessibility.framework.AccessibilityCheckResultUtils.matchesCheck
 import com.google.android.apps.common.testing.accessibility.framework.checks.DuplicateClickableBoundsCheck
+import com.google.android.apps.common.testing.accessibility.framework.checks.SpeakableTextPresentCheck
 import com.google.android.apps.common.testing.accessibility.framework.integrations.espresso.AccessibilityValidator
 import leakcanary.LeakAssertions
 import org.hamcrest.Matchers.anyOf
@@ -113,8 +114,16 @@ class DownloadTest : BaseActivityTest() {
           )
         }
       }
-    val accessibilityValidator = AccessibilityValidator().setRunChecksFromRootView(true).apply {
-      setSuppressingResultMatcher(
+    val accessibilityValidator = AccessibilityValidator().setRunChecksFromRootView(true)
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+      accessibilityValidator.setSuppressingResultMatcher(
+        anyOf(
+          matchesCheck(DuplicateClickableBoundsCheck::class.java),
+          matchesCheck(SpeakableTextPresentCheck::class.java)
+        )
+      )
+    } else {
+      accessibilityValidator.setSuppressingResultMatcher(
         anyOf(
           matchesCheck(DuplicateClickableBoundsCheck::class.java)
         )

app/src/androidTest/java/org/kiwix/kiwixmobile/initial/download/InitialDownloadTest.kt

@@ -18,6 +18,7 @@
 
 package org.kiwix.kiwixmobile.initial.download
 
+import android.os.Build
 import androidx.compose.ui.test.junit4.accessibility.enableAccessibilityChecks
 import androidx.compose.ui.test.junit4.createComposeRule
 import androidx.core.content.edit
@@ -30,6 +31,7 @@ import androidx.test.uiautomator.UiDevice
 import com.adevinta.android.barista.interaction.BaristaSleepInteractions
 import com.google.android.apps.common.testing.accessibility.framework.AccessibilityCheckResultUtils.matchesCheck
 import com.google.android.apps.common.testing.accessibility.framework.checks.DuplicateClickableBoundsCheck
+import com.google.android.apps.common.testing.accessibility.framework.checks.SpeakableTextPresentCheck
 import com.google.android.apps.common.testing.accessibility.framework.integrations.espresso.AccessibilityValidator
 import leakcanary.LeakAssertions
 import org.hamcrest.Matchers.anyOf
@@ -94,8 +96,16 @@ class InitialDownloadTest : BaseActivityTest() {
           )
         }
       }
-    val accessibilityValidator = AccessibilityValidator().setRunChecksFromRootView(true).apply {
-      setSuppressingResultMatcher(
+    val accessibilityValidator = AccessibilityValidator().setRunChecksFromRootView(true)
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+      accessibilityValidator.setSuppressingResultMatcher(
+        anyOf(
+          matchesCheck(DuplicateClickableBoundsCheck::class.java),
+          matchesCheck(SpeakableTextPresentCheck::class.java)
+        )
+      )
+    } else {
+      accessibilityValidator.setSuppressingResultMatcher(
         anyOf(
           matchesCheck(DuplicateClickableBoundsCheck::class.java)
         )

app/src/main/java/org/kiwix/kiwixmobile/webserver/KiwixServer.kt

@@ -86,6 +86,15 @@ class KiwixServer @Inject constructor(
       }
   }
 
+  fun getServerAddress(): String? {
+    val serverAccessUrls = jniKiwixServer.serverAccessUrls
+    return if (serverAccessUrls.size > 0) {
+      serverAccessUrls[0]
+    } else {
+      null
+    }
+  }
+
   fun startServer(port: Int): Boolean {
     jniKiwixServer.setPort(port)
     return jniKiwixServer.start()

app/src/main/java/org/kiwix/kiwixmobile/webserver/WebServerHelper.kt

@@ -108,6 +108,8 @@ class WebServerHelper @Inject constructor(
     ServerUtils.isServerStarted = isStarted
   }
 
+  fun getServerAddress(): String = kiwixServer?.getServerAddress().orEmpty()
+
   /**
    * Starts polling for a valid IP address using a [Flow].
    * - Polls every [FINDING_IP_ADDRESS_RETRY_TIME] milliseconds.

app/src/main/java/org/kiwix/kiwixmobile/webserver/ZimHostFragment.kt

@@ -350,7 +350,7 @@ class ZimHostFragment : BaseFragment(), ZimHostCallbacks, ZimHostContract.View {
       presenter.loadBooks(sharedPreferenceUtil.hostedBooks)
     }
     if (ServerUtils.isServerStarted) {
-      ip = ServerUtils.getSocketAddress()
+      ip = ServerUtils.serverAddress
       layoutServerStarted()
     } else {
       layoutServerStopped()
@@ -442,6 +442,7 @@ class ZimHostFragment : BaseFragment(), ZimHostCallbacks, ZimHostContract.View {
     // Dismiss dialog when server started.
     alertDialogShower.dismiss()
     this.ip = ip
+    ServerUtils.serverAddress = ip
     layoutServerStarted()
   }
 

app/src/main/java/org/kiwix/kiwixmobile/webserver/wifi_hotspot/HotspotService.kt

@@ -31,7 +31,7 @@ import kotlinx.coroutines.withContext
 import org.kiwix.kiwixmobile.KiwixApp
 import org.kiwix.kiwixmobile.core.R
 import org.kiwix.kiwixmobile.core.extensions.registerReceiver
-import org.kiwix.kiwixmobile.core.utils.ServerUtils.getSocketAddress
+import org.kiwix.kiwixmobile.core.utils.ServerUtils.serverAddress
 import org.kiwix.kiwixmobile.webserver.WebServerHelper
 import org.kiwix.kiwixmobile.webserver.ZimHostCallbacks
 import org.kiwix.kiwixmobile.webserver.ZimHostFragment
@@ -88,7 +88,7 @@ class HotspotService :
                 webServerHelper?.startServerHelper(it, restartServer)
               }
             if (serverStatus?.isServerStarted == true) {
-              zimHostCallbacks?.onServerStarted(getSocketAddress())
+              zimHostCallbacks?.onServerStarted(webServerHelper?.getServerAddress().orEmpty())
               startForegroundNotificationHelper()
               if (!restartServer) {
                 Toast.makeText(
@@ -141,7 +141,7 @@ class HotspotService :
   private fun startForegroundNotificationHelper() {
     startForeground(
       HotspotNotificationManager.HOTSPOT_NOTIFICATION_ID,
-      hotspotNotificationManager?.buildForegroundNotification(getSocketAddress())
+      hotspotNotificationManager?.buildForegroundNotification(serverAddress)
     )
   }
 

buildSrc/src/main/kotlin/Versions.kt

@@ -88,7 +88,7 @@ object Versions {
 
   const val androidx_activity: String = "1.9.3"
 
-  const val libkiwix: String = "2.2.4"
+  const val libkiwix: String = "2.4.0"
 
   const val material: String = "1.12.0"
 

core/src/main/java/org/kiwix/kiwixmobile/core/utils/ServerUtils.kt

@@ -26,6 +26,12 @@ object ServerUtils {
   @JvmField var port = 0
 
   @JvmField var isServerStarted = false
+
+  /**
+   * Stores the server address returned by libkiwix so that when the Hotspot screen
+   * becomes visible again, the server address can be displayed.
+   */
+  @JvmField var serverAddress = ""
   const val INVALID_IP = "-1" // To remove extra characters from IP for Android Pie
   private const val TAG = "ServerUtils"
 
@@ -62,9 +68,6 @@ object ServerUtils {
     return ipRegex.find(ip, 0)?.value ?: throw IllegalArgumentException()
   }
 
-  @JvmStatic fun getSocketAddress(): String =
-    "http://${getIpAddress()}:$port".replace("\n", "")
-
   @JvmStatic fun getIp(): String? =
     getIpAddress()?.replace("\n", "")?.takeIf(String::isNotEmpty) ?: INVALID_IP
 }