Merge pull request #4130 from kiwix/Issue#4106

Fixed: Downloads were not automatically starting showing progress when reopening the app(If downloads paused due to any network error).
kiwix · Dec 18, 2024 · 4b8fe6d · 4b8fe6d
2 parents 0db479a + 1f55d95
commit 4b8fe6d
Show file tree

Hide file tree

Showing 17 changed files with 571 additions and 1,024 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -12,6 +12,9 @@
     android:name="android.permission.NEARBY_WIFI_DEVICES"
     android:usesPermissionFlags="neverForLocation"
     tools:targetApi="s" />
+  <!-- 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" />
 
   <application
     android:name=".KiwixApp"

diff --git a/app/src/main/java/org/kiwix/kiwixmobile/nav/destination/library/OnlineLibraryFragment.kt b/app/src/main/java/org/kiwix/kiwixmobile/nav/destination/library/OnlineLibraryFragment.kt
@@ -148,6 +148,10 @@ class OnlineLibraryFragment : BaseFragment(), FragmentActivityExtensions {
         },
         {
           context?.let { context ->
+            if (isNotConnected) {
+              noInternetSnackbar()
+              return@let
+            }
             downloader.pauseResumeDownload(
               it.downloadId,
               it.downloadState.toReadableState(context).contains(getString(string.paused_state))

diff --git a/core/src/main/AndroidManifest.xml b/core/src/main/AndroidManifest.xml
@@ -13,12 +13,8 @@
   <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
 
   <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
-  <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" />
+  <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
+
   <queries>
     <intent>
       <action android:name="android.intent.action.TTS_SERVICE" />
@@ -52,8 +48,8 @@
 
   <application
     android:allowBackup="true"
+    android:dataExtractionRules="@xml/data_extraction_rules"
     android:fullBackupContent="@xml/backup_rules"
-    android:dataExtractionRules = "@xml/data_extraction_rules"
     android:hardwareAccelerated="true"
     android:largeHeap="true"
     android:requestLegacyExternalStorage="true"
@@ -80,9 +76,9 @@
       android:name="androidx.core.content.FileProvider"
       android:authorities="${applicationId}.fileprovider"
       android:exported="false"
+      android:grantUriPermissions="true"
       tools:node="merge"
-      tools:overrideLibrary="com.squareup.picasso.picasso"
-      android:grantUriPermissions="true">
+      tools:overrideLibrary="com.squareup.picasso.picasso">
       <meta-data
         android:name="android.support.FILE_PROVIDER_PATHS"
         android:resource="@xml/provider_paths" />
@@ -92,8 +88,5 @@
       android:name=".error.DiagnosticReportActivity"
       android:exported="false" />
     <service android:name=".read_aloud.ReadAloudService" />
-    <service
-      android:name=".downloader.downloadManager.DownloadMonitorService"
-      android:foregroundServiceType="dataSync" />
   </application>
 </manifest>
diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/dao/DownloadRoomDao.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/dao/DownloadRoomDao.kt
@@ -113,7 +113,7 @@ abstract class DownloadRoomDao {
     sharedPreferenceUtil: SharedPreferenceUtil
   ) {
     if (doesNotAlreadyExist(book)) {
-      val downloadRequest = DownloadRequest(url)
+      val downloadRequest = DownloadRequest(url, book.title)
       saveDownload(
         DownloadRoomEntity(
           url,

diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/dao/entities/DownloadRoomEntity.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/dao/entities/DownloadRoomEntity.kt
@@ -54,7 +54,8 @@ data class DownloadRoomEntity(
   val size: String,
   val name: String?,
   val favIcon: String,
-  val tags: String? = null
+  val tags: String? = null,
+  var pausedByUser: Boolean = false
 ) {
   constructor(downloadUrl: String, downloadId: Long, book: Book, file: String?) : this(
     file = file,
@@ -99,7 +100,8 @@ data class DownloadRoomEntity(
     totalSizeOfDownload = download.totalSizeOfDownload,
     status = download.state,
     error = download.error,
-    progress = download.progress
+    progress = download.progress,
+    pausedByUser = download.pausedByUser
   )
 }
 

diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/data/KiwixRoomDatabase.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/data/KiwixRoomDatabase.kt
@@ -44,7 +44,7 @@ import org.kiwix.kiwixmobile.core.dao.entities.ZimSourceRoomConverter
     NotesRoomEntity::class,
     DownloadRoomEntity::class
   ],
-  version = 5,
+  version = 6,
   exportSchema = false
 )
 @TypeConverters(HistoryRoomDaoCoverts::class, ZimSourceRoomConverter::class)
@@ -62,7 +62,13 @@ abstract class KiwixRoomDatabase : RoomDatabase() {
           ?: Room.databaseBuilder(context, KiwixRoomDatabase::class.java, "KiwixRoom.db")
             // We have already database name called kiwix.db in order to avoid complexity we named
             // as kiwixRoom.db
-            .addMigrations(MIGRATION_1_2, MIGRATION_2_3, MIGRATION_3_4, MIGRATION_4_5)
+            .addMigrations(
+              MIGRATION_1_2,
+              MIGRATION_2_3,
+              MIGRATION_3_4,
+              MIGRATION_4_5,
+              MIGRATION_5_6
+            )
             .build().also { db = it }
       }
     }
@@ -202,6 +208,15 @@ abstract class KiwixRoomDatabase : RoomDatabase() {
       }
     }
 
+    @Suppress("MagicNumber")
+    private val MIGRATION_5_6 = object : Migration(5, 6) {
+      override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL(
+          "ALTER TABLE DownloadRoomEntity ADD COLUMN pausedByUser INTEGER NOT NULL DEFAULT 0"
+        )
+      }
+    }
+
     fun destroyInstance() {
       db = null
     }

diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/di/components/CoreServiceComponent.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/di/components/CoreServiceComponent.kt
@@ -23,14 +23,12 @@ 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 {

diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/di/modules/DownloaderModule.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/di/modules/DownloaderModule.kt
@@ -18,8 +18,6 @@
 package org.kiwix.kiwixmobile.core.di.modules
 
 import android.app.DownloadManager
-import android.app.NotificationManager
-import android.content.Context
 import dagger.Module
 import dagger.Provides
 import org.kiwix.kiwixmobile.core.dao.DownloadRoomDao
@@ -30,7 +28,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.DownloadNotificationManager
 import org.kiwix.kiwixmobile.core.utils.SharedPreferenceUtil
 import javax.inject.Singleton
 
@@ -69,11 +66,4 @@ object DownloaderModule {
   fun providesDownloadManagerBroadcastReceiver(
     callback: DownloadManagerBroadcastReceiver.Callback
   ): DownloadManagerBroadcastReceiver = DownloadManagerBroadcastReceiver(callback)
-
-  @Provides
-  @Singleton
-  fun providesDownloadNotificationManager(
-    context: Context,
-    notificationManager: NotificationManager
-  ): DownloadNotificationManager = DownloadNotificationManager(context, notificationManager)
 }