Browse Source

Improve notifications for different custom Android OS

Signed-off-by: alperozturk <alper_ozturk@proton.me>
alperozturk 1 year ago
parent
commit
a0482e496d

+ 2 - 2
app/src/main/java/com/nextcloud/client/files/downloader/DownloadNotificationManager.kt

@@ -72,7 +72,7 @@ class DownloadNotificationManager(
             setProgress(100, 0, operation.size < 0)
             setProgress(100, 0, operation.size < 0)
             setContentText(
             setContentText(
                 String.format(
                 String.format(
-                    context.getString(R.string.downloader_download_in_progress_content), 0,
+                    context.getString(R.string.downloader_download_in_progress), 0,
                     File(operation.savePath).name
                     File(operation.savePath).name
                 )
                 )
             )
             )
@@ -101,7 +101,7 @@ class DownloadNotificationManager(
             setProgress(100, percent, totalToTransfer < 0)
             setProgress(100, percent, totalToTransfer < 0)
             val fileName: String = filePath.substring(filePath.lastIndexOf(FileUtils.PATH_SEPARATOR) + 1)
             val fileName: String = filePath.substring(filePath.lastIndexOf(FileUtils.PATH_SEPARATOR) + 1)
             val text =
             val text =
-                String.format(context.getString(R.string.downloader_download_in_progress_content), percent, fileName)
+                String.format(context.getString(R.string.downloader_download_in_progress), percent, fileName)
             val title =
             val title =
                 context.getString(R.string.downloader_download_in_progress_ticker)
                 context.getString(R.string.downloader_download_in_progress_ticker)
             updateNotificationText(title, text, false)
             updateNotificationText(title, text, false)

+ 1 - 0
app/src/main/res/values/strings.xml

@@ -169,6 +169,7 @@
     <string name="uploads_view_group_header" translatable="false">%1$s (%2$d)</string>
     <string name="uploads_view_group_header" translatable="false">%1$s (%2$d)</string>
     <string name="downloader_download_in_progress_ticker">Downloading…</string>
     <string name="downloader_download_in_progress_ticker">Downloading…</string>
     <string name="downloader_download_completed">Downloads are completed</string>
     <string name="downloader_download_completed">Downloads are completed</string>
+    <string name="downloader_download_in_progress">%1$d%% %2$s</string>
     <string name="downloader_download_in_progress_content">%1$d%% Downloading %2$s</string>
     <string name="downloader_download_in_progress_content">%1$d%% Downloading %2$s</string>
     <string name="downloader_download_succeeded_ticker">Downloaded</string>
     <string name="downloader_download_succeeded_ticker">Downloaded</string>
     <string name="downloader_download_succeeded_content">%1$s downloaded</string>
     <string name="downloader_download_succeeded_content">%1$s downloaded</string>