Merge pull request #3880 from kiwix/Fixes#3878

Fixed ServiceWorker Initialization Issue
kiwix · Jun 15, 2024 · 9f94965 · 9f94965
2 parents ab5fb35 + 4c3af12
commit 9f94965
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/CoreApp.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/CoreApp.kt
@@ -83,6 +83,7 @@ abstract class CoreApp : Application() {
       .build()
     AndroidThreeTen.init(this)
     coreComponent.inject(this)
+    serviceWorkerInitialiser.init(this)
     downloadMonitor.init()
     nightModeConfig.init()
     fileLogger.writeLogFile(this)

diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/ServiceWorkerInitialiser.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/ServiceWorkerInitialiser.kt
@@ -18,6 +18,9 @@
 
 package org.kiwix.kiwixmobile.core
 
+import android.app.ActivityManager
+import android.content.Context
+import android.os.Process
 import android.webkit.WebResourceRequest
 import android.webkit.WebResourceResponse
 import androidx.webkit.ServiceWorkerClientCompat
@@ -26,14 +29,23 @@ import androidx.webkit.WebViewFeature
 import org.kiwix.kiwixmobile.core.reader.ZimReaderContainer
 import javax.inject.Inject
 
-class ServiceWorkerInitialiser @Inject constructor(zimReaderContainer: ZimReaderContainer) {
-  init {
-    if (WebViewFeature.isFeatureSupported(WebViewFeature.SERVICE_WORKER_BASIC_USAGE)) {
+class ServiceWorkerInitialiser @Inject constructor(val zimReaderContainer: ZimReaderContainer) {
+  fun init(context: Context) {
+    if (isMainProcess(context) &&
+      WebViewFeature.isFeatureSupported(WebViewFeature.SERVICE_WORKER_BASIC_USAGE)
+    ) {
       ServiceWorkerControllerCompat.getInstance()
         .setServiceWorkerClient(object : ServiceWorkerClientCompat() {
           override fun shouldInterceptRequest(request: WebResourceRequest): WebResourceResponse? =
             zimReaderContainer.load(request.url.toString(), request.requestHeaders)
         })
     }
   }
+
+  private fun isMainProcess(context: Context): Boolean {
+    val activityManager = context.getSystemService(Context.ACTIVITY_SERVICE) as ActivityManager
+    return activityManager.runningAppProcesses.find {
+      it.pid == Process.myPid()
+    }?.processName == context.packageName
+  }
 }