From 8f6919471655fece45c084e282c818c16b3fa4ce Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Wed, 10 Jan 2024 10:16:26 +0100
Subject: [PATCH] Improve notifications for different custom Android OS

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../client/files/downloader/DownloadNotificationManager.kt    | 4 ++--
 app/src/main/res/values/strings.xml                           | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/client/files/downloader/DownloadNotificationManager.kt b/app/src/main/java/com/nextcloud/client/files/downloader/DownloadNotificationManager.kt
index 60ce0c1911b0..1683ceade7fb 100644
--- a/app/src/main/java/com/nextcloud/client/files/downloader/DownloadNotificationManager.kt
+++ b/app/src/main/java/com/nextcloud/client/files/downloader/DownloadNotificationManager.kt
@@ -72,7 +72,7 @@ class DownloadNotificationManager(
             setProgress(100, 0, operation.size < 0)
             setContentText(
                 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
                 )
             )
@@ -101,7 +101,7 @@ class DownloadNotificationManager(
             setProgress(100, percent, totalToTransfer < 0)
             val fileName: String = filePath.substring(filePath.lastIndexOf(FileUtils.PATH_SEPARATOR) + 1)
             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 =
                 context.getString(R.string.downloader_download_in_progress_ticker)
             updateNotificationText(title, text, false)
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f2975bcc376c..6d862305f865 100644
--- a/app/src/main/res/values/strings.xml
+++ b/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="downloader_download_in_progress_ticker">Downloading…</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_succeeded_ticker">Downloaded</string>
     <string name="downloader_download_succeeded_content">%1$s downloaded</string>