Checkbox always visible to user in Wifi Hotspot and user can select and unselect zim files when server already started

Author: MohitMaliDeveloper

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

@@ -43,11 +43,11 @@ class WebServerHelper @Inject constructor(
   private var isServerStarted = false
   private var validIpAddressDisposable: Disposable? = null
 
-  fun startServerHelper(selectedBooksPath: ArrayList<String>): Boolean {
+  fun startServerHelper(selectedBooksPath: ArrayList<String>, restartServer: Boolean): Boolean {
     val ip = getIpAddress()
     return if (ip.isNullOrEmpty()) {
       false
-    } else if (startAndroidWebServer(selectedBooksPath)) {
+    } else if (startAndroidWebServer(selectedBooksPath, restartServer)) {
       true
     } else {
       isServerStarted
@@ -61,17 +61,27 @@ class WebServerHelper @Inject constructor(
     }
   }
 
-  private fun startAndroidWebServer(selectedBooksPath: ArrayList<String>): Boolean {
+  private fun startAndroidWebServer(
+    selectedBooksPath: ArrayList<String>,
+    restartServer: Boolean
+  ): Boolean {
     if (!isServerStarted) {
-      ServerUtils.port = DEFAULT_PORT
-      kiwixServer = kiwixServerFactory.createKiwixServer(selectedBooksPath).also {
-        updateServerState(it.startServer(ServerUtils.port))
-        Log.d(TAG, "Server status$isServerStarted")
-      }
+      startKiwixServer(selectedBooksPath)
+    } else if (restartServer) {
+      kiwixServer?.stopServer()
+      startKiwixServer(selectedBooksPath)
     }
     return isServerStarted
   }
 
+  private fun startKiwixServer(selectedBooksPath: ArrayList<String>) {
+    ServerUtils.port = DEFAULT_PORT
+    kiwixServer = kiwixServerFactory.createKiwixServer(selectedBooksPath).also {
+      updateServerState(it.startServer(ServerUtils.port))
+      Log.d(TAG, "Server status$isServerStarted")
+    }
+  }
+
   private fun updateServerState(isStarted: Boolean) {
     isServerStarted = isStarted
     ServerUtils.isServerStarted = isStarted

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

@@ -82,7 +82,6 @@ class ZimHostFragment : BaseFragment(), ZimHostCallbacks, ZimHostContract.View {
   private lateinit var serviceConnection: ServiceConnection
   private var progressDialog: ProgressDialog? = null
   private var activityZimHostBinding: ActivityZimHostBinding? = null
-  private var allBooks: List<BooksOnDiskListItem>? = null
   private val selectedBooksPath: ArrayList<String>
     get() {
       return booksAdapter.items
@@ -101,16 +100,6 @@ class ZimHostFragment : BaseFragment(), ZimHostCallbacks, ZimHostContract.View {
         as ArrayList<String>
     }
 
-  private val selectedBooks: List<BooksOnDiskListItem>
-    get() {
-      return booksAdapter.items
-        .filter(BooksOnDiskListItem::isSelected)
-        .filterIsInstance<BookOnDisk>()
-        .map {
-          it
-        }
-    }
-
   override fun onCreateView(
     inflater: LayoutInflater,
     container: ViewGroup?,
@@ -277,6 +266,9 @@ class ZimHostFragment : BaseFragment(), ZimHostCallbacks, ZimHostContract.View {
     }
     booksAdapter.items = booksList
     saveHostedBooks(booksList)
+    if (ServerUtils.isServerStarted) {
+      startWifiHotspot(true)
+    }
   }
 
   override fun onStart() {
@@ -331,8 +323,7 @@ class ZimHostFragment : BaseFragment(), ZimHostCallbacks, ZimHostContract.View {
     activityZimHostBinding?.startServerButton?.setBackgroundColor(
       resources.getColor(R.color.stopServerRed)
     )
-    booksAdapter.items = selectedBooks
-    bookDelegate.selectionMode = SelectionMode.NORMAL
+    bookDelegate.selectionMode = SelectionMode.MULTI
     booksAdapter.notifyDataSetChanged()
   }
 
@@ -358,7 +349,6 @@ class ZimHostFragment : BaseFragment(), ZimHostCallbacks, ZimHostContract.View {
     activityZimHostBinding?.startServerButton?.setBackgroundColor(
       resources.getColor(R.color.startServerGreen)
     )
-    allBooks?.let { booksAdapter.items = it }
     bookDelegate.selectionMode = SelectionMode.MULTI
     booksAdapter.notifyDataSetChanged()
   }
@@ -433,15 +423,18 @@ class ZimHostFragment : BaseFragment(), ZimHostCallbacks, ZimHostContract.View {
 
   override fun addBooks(books: List<BooksOnDiskListItem>) {
     booksAdapter.items = books
-    allBooks = books
   }
 
   override fun onIpAddressValid() {
     progressDialog?.dismiss()
+    startWifiHotspot(false)
+  }
+
+  private fun startWifiHotspot(restartServer: Boolean) {
     requireActivity().startService(
       createHotspotIntent(ACTION_START_SERVER).putStringArrayListExtra(
         SELECTED_ZIM_PATHS_KEY, selectedBooksPath
-      )
+      ).putExtra(RESTART_SERVER, restartServer)
     )
   }
 
@@ -452,6 +445,7 @@ class ZimHostFragment : BaseFragment(), ZimHostCallbacks, ZimHostContract.View {
 
   companion object {
     const val SELECTED_ZIM_PATHS_KEY = "selected_zim_paths"
+    const val RESTART_SERVER = "restart_server"
     const val PERMISSION_REQUEST_CODE_COARSE_LOCATION = 10
   }
 }

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

@@ -30,6 +30,7 @@ import org.kiwix.kiwixmobile.core.utils.ServerUtils.getSocketAddress
 import org.kiwix.kiwixmobile.webserver.WebServerHelper
 import org.kiwix.kiwixmobile.webserver.ZimHostCallbacks
 import org.kiwix.kiwixmobile.webserver.ZimHostFragment
+import org.kiwix.kiwixmobile.webserver.ZimHostFragment.Companion.RESTART_SERVER
 import java.lang.ref.WeakReference
 import javax.inject.Inject
 
@@ -69,21 +70,30 @@ class HotspotService :
     super.onDestroy()
   }
 
+  @Suppress("NestedBlockDepth")
   override fun onStartCommand(intent: Intent, flags: Int, startId: Int): Int {
     when (intent.action) {
-      ACTION_START_SERVER ->
+      ACTION_START_SERVER -> {
+        val restartServer = intent.getBooleanExtra(RESTART_SERVER, false)
         intent.getStringArrayListExtra(ZimHostFragment.SELECTED_ZIM_PATHS_KEY)?.let {
-          if (webServerHelper?.startServerHelper(it) == true) {
+          if (webServerHelper?.startServerHelper(
+              it,
+              restartServer
+            ) == true
+          ) {
             zimHostCallbacks?.onServerStarted(getSocketAddress())
             startForegroundNotificationHelper()
-            Toast.makeText(
-              this, R.string.server_started_successfully_toast_message,
-              Toast.LENGTH_SHORT
-            ).show()
+            if (!restartServer) {
+              Toast.makeText(
+                this, R.string.server_started_successfully_toast_message,
+                Toast.LENGTH_SHORT
+              ).show()
+            }
           } else {
             onServerFailedToStart()
           }
         } ?: kotlin.run(::onServerFailedToStart)
+      }
       ACTION_STOP_SERVER -> {
         Toast.makeText(
           this, R.string.server_stopped_successfully_toast_message,