diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/downloader/downloadManager/DownloadMonitorService.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/downloader/downloadManager/DownloadMonitorService.kt index bb8e750e70..1532b338c2 100644 --- a/core/src/main/java/org/kiwix/kiwixmobile/core/downloader/downloadManager/DownloadMonitorService.kt +++ b/core/src/main/java/org/kiwix/kiwixmobile/core/downloader/downloadManager/DownloadMonitorService.kt @@ -33,7 +33,6 @@ import com.tonyodev.fetch2.Download import com.tonyodev.fetch2.Error import com.tonyodev.fetch2.Fetch import com.tonyodev.fetch2.FetchListener -import com.tonyodev.fetch2.R import com.tonyodev.fetch2.Status import com.tonyodev.fetch2.util.DEFAULT_NOTIFICATION_TIMEOUT_AFTER_RESET import com.tonyodev.fetch2core.DownloadBlock @@ -276,7 +275,7 @@ class DownloadMonitorService : Service() { notificationBuilder.setPriority(NotificationCompat.PRIORITY_DEFAULT) .setSmallIcon(android.R.drawable.stat_sys_download_done) .setContentTitle(notificationTitle) - .setContentText(getString(R.string.fetch_notification_download_complete)) + .setContentText(getString(string.complete)) .setOngoing(false) .setGroup(download.id.toString()) .setGroupSummary(false) diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/downloader/downloadManager/FetchDownloadNotificationManager.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/downloader/downloadManager/FetchDownloadNotificationManager.kt index 0730784808..d628ca86f4 100644 --- a/core/src/main/java/org/kiwix/kiwixmobile/core/downloader/downloadManager/FetchDownloadNotificationManager.kt +++ b/core/src/main/java/org/kiwix/kiwixmobile/core/downloader/downloadManager/FetchDownloadNotificationManager.kt @@ -108,6 +108,20 @@ class FetchDownloadNotificationManager @Inject constructor( } } + override fun getSubtitleText( + context: Context, + downloadNotification: DownloadNotification + ): String { + return when { + downloadNotification.isCompleted -> context.getString(R.string.complete) + downloadNotification.isFailed -> context.getString(R.string.download_failed_state) + downloadNotification.isPaused -> context.getString(R.string.paused_state) + downloadNotification.isQueued -> context.getString(R.string.resuming_state) + downloadNotification.etaInMilliSeconds < 0 -> context.getString(R.string.downloading_state) + else -> super.getSubtitleText(context, downloadNotification) + } + } + @RequiresApi(Build.VERSION_CODES.O) private fun createChannel(channelId: String, context: Context) = NotificationChannel( @@ -253,7 +267,7 @@ class FetchDownloadNotificationManager @Inject constructor( return notificationBuilder.setPriority(NotificationCompat.PRIORITY_DEFAULT) .setSmallIcon(android.R.drawable.stat_sys_download_done) .setContentTitle(notificationTitle) - .setContentText(context.getString(string.fetch_notification_download_paused)) + .setContentText(context.getString(R.string.paused_state)) // Set the ongoing true so that could not cancel the pause notification. // However, on Android 14 and above user can cancel the notification by swipe right so we // can't control that see https://developer.android.com/about/versions/14/behavior-changes-all#non-dismissable-notifications diff --git a/core/src/main/res/values-qq/strings.xml b/core/src/main/res/values-qq/strings.xml index c07eefb559..be846b3ca7 100644 --- a/core/src/main/res/values-qq/strings.xml +++ b/core/src/main/res/values-qq/strings.xml @@ -329,4 +329,7 @@ This is a text label, by clicking on this text user navigates to the app settings on their device. This message appears in the “Android Dialog” as an information message. When the user tries to run any functionality which requires notification access but the app does not have that access, then this message shows to the user to give notification access. {{Ignored}} + This text is shown to inform the user that the current state of download is resuming. + This text is shown to inform the user that the current state of download is actively in progress. + This text is shown to inform the user when a download has been failed. diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml index 4cae142da5..d695ed7bff 100644 --- a/core/src/main/res/values/strings.xml +++ b/core/src/main/res/values/strings.xml @@ -402,4 +402,7 @@ Donate Today %s needs your help. Make a donation + Resuming + Downloading + Failed