Merge pull request #4108 from kiwix/Fixes#4106

Fixed: Download notification was disappearing when the application is in background.

Author: kelson42

app/src/main/AndroidManifest.xml

@@ -8,9 +8,6 @@
     tools:ignore="CoarseFineLocation" />
   <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
   <uses-permission android:name="${permission}" />
-  <!-- Device with versions >= Pie need this permission -->
-  <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-  <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
   <uses-permission
     android:name="android.permission.NEARBY_WIFI_DEVICES"
     android:usesPermissionFlags="neverForLocation"

app/src/main/java/org/kiwix/kiwixmobile/di/modules/ServiceModule.kt

@@ -24,7 +24,6 @@ import android.content.Context
 import dagger.Module
 import dagger.Provides
 import org.kiwix.kiwixmobile.core.qr.GenerateQR
-import org.kiwix.kiwixmobile.core.read_aloud.ReadAloudNotificationManger
 import org.kiwix.kiwixmobile.di.ServiceScope
 import org.kiwix.kiwixmobile.webserver.KiwixServer
 import org.kiwix.kiwixmobile.webserver.WebServerHelper
@@ -34,12 +33,6 @@ import org.kiwix.kiwixmobile.webserver.wifi_hotspot.IpAddressCallbacks
 
 @Module
 class ServiceModule {
-  @Provides
-  @ServiceScope
-  fun providesReadAloudNotificationManager(
-    notificationManager: NotificationManager,
-    context: Context
-  ): ReadAloudNotificationManger = ReadAloudNotificationManger(notificationManager, context)
 
   @Provides
   @ServiceScope

core/src/main/AndroidManifest.xml

@@ -16,6 +16,9 @@
   <uses-permission
     android:name="android.permission.DOWNLOAD_WITHOUT_NOTIFICATION" />
   <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT"/>
+  <!-- Device with versions >= Pie need this permission -->
+  <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+  <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
   <queries>
     <intent>
       <action android:name="android.intent.action.TTS_SERVICE" />
@@ -90,5 +93,8 @@
       android:name=".error.DiagnosticReportActivity"
       android:exported="false" />
     <service android:name=".read_aloud.ReadAloudService" />
+    <service
+      android:name=".downloader.downloadManager.DownloadMonitorService"
+      android:foregroundServiceType="dataSync" />
   </application>
 </manifest>

core/src/main/java/org/kiwix/kiwixmobile/core/di/components/CoreComponent.kt

@@ -52,7 +52,6 @@ import org.kiwix.kiwixmobile.core.di.modules.NetworkModule
 import org.kiwix.kiwixmobile.core.di.modules.SearchModule
 import org.kiwix.kiwixmobile.core.downloader.Downloader
 import org.kiwix.kiwixmobile.core.downloader.downloadManager.DownloadManagerBroadcastReceiver
-import org.kiwix.kiwixmobile.core.downloader.downloadManager.DownloadNotificationActionsBroadcastReceiver
 import org.kiwix.kiwixmobile.core.error.ErrorActivity
 import org.kiwix.kiwixmobile.core.main.KiwixWebView
 import org.kiwix.kiwixmobile.core.reader.ZimFileReader
@@ -117,8 +116,6 @@ interface CoreComponent {
   fun mutex(): Mutex
 
   fun downloadManagerBroadCastReceiver(): DownloadManagerBroadcastReceiver
-  fun downloadNotificationActionBroadCastReceiver(): DownloadNotificationActionsBroadcastReceiver
-
   fun inject(application: CoreApp)
   fun inject(kiwixWebView: KiwixWebView)
   fun inject(storageSelectDialog: StorageSelectDialog)

core/src/main/java/org/kiwix/kiwixmobile/core/di/components/CoreServiceComponent.kt

@@ -23,12 +23,14 @@ import dagger.BindsInstance
 import dagger.Subcomponent
 import org.kiwix.kiwixmobile.core.di.CoreServiceScope
 import org.kiwix.kiwixmobile.core.di.modules.CoreServiceModule
+import org.kiwix.kiwixmobile.core.downloader.downloadManager.DownloadMonitorService
 import org.kiwix.kiwixmobile.core.read_aloud.ReadAloudService
 
 @Subcomponent(modules = [CoreServiceModule::class])
 @CoreServiceScope
 interface CoreServiceComponent {
   fun inject(readAloudService: ReadAloudService)
+  fun inject(downloadMonitorService: DownloadMonitorService)
 
   @Subcomponent.Builder
   interface Builder {

core/src/main/java/org/kiwix/kiwixmobile/core/di/modules/DownloaderModule.kt

@@ -30,7 +30,6 @@ import org.kiwix.kiwixmobile.core.downloader.DownloaderImpl
 import org.kiwix.kiwixmobile.core.downloader.downloadManager.DownloadManagerBroadcastReceiver
 import org.kiwix.kiwixmobile.core.downloader.downloadManager.DownloadManagerMonitor
 import org.kiwix.kiwixmobile.core.downloader.downloadManager.DownloadManagerRequester
-import org.kiwix.kiwixmobile.core.downloader.downloadManager.DownloadNotificationActionsBroadcastReceiver
 import org.kiwix.kiwixmobile.core.downloader.downloadManager.DownloadNotificationManager
 import org.kiwix.kiwixmobile.core.utils.SharedPreferenceUtil
 import javax.inject.Singleton
@@ -71,13 +70,6 @@ object DownloaderModule {
     callback: DownloadManagerBroadcastReceiver.Callback
   ): DownloadManagerBroadcastReceiver = DownloadManagerBroadcastReceiver(callback)
 
-  @Provides
-  @Singleton
-  fun providesDownloadNotificationActionsBroadcastReceiver(
-    downloadManagerMonitor: DownloadManagerMonitor
-  ): DownloadNotificationActionsBroadcastReceiver =
-    DownloadNotificationActionsBroadcastReceiver(downloadManagerMonitor)
-
   @Provides
   @Singleton
   fun providesDownloadNotificationManager(

core/src/main/java/org/kiwix/kiwixmobile/core/di/modules/NetworkModule.kt

@@ -35,8 +35,8 @@ const val CONNECTION_TIMEOUT = 10L
 // increase the read and call timeout since the content is 19MB large so it takes
 // more time to read on slow internet connection, and due to less read timeout
 // the request is canceled.
-const val READ_TIMEOUT = 180L
-const val CALL_TIMEOUT = 180L
+const val READ_TIMEOUT = 300L
+const val CALL_TIMEOUT = 300L
 const val USER_AGENT = "kiwix-android-version:${BuildConfig.VERSION_CODE}"
 const val KIWIX_DOWNLOAD_URL = "https://mirror.download.kiwix.org/"