Преглед на файлове

Dont show success notifications

Signed-off-by: alperozturk <alper_ozturk@proton.me>
alperozturk преди 1 година
родител
ревизия
c4ba0e0b43

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

@@ -104,18 +104,10 @@ class DownloadNotificationManager(
                 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)
+            updateNotificationText(title, text)
         }
     }
 
-    @Suppress("MagicNumber")
-    fun showCompleteNotification(text: String) {
-        Handler(Looper.getMainLooper()).postDelayed({
-            updateNotificationText(null, text, true)
-            dismissNotification()
-        }, 3000)
-    }
-
     @Suppress("MagicNumber")
     fun dismissNotification() {
         Handler(Looper.getMainLooper()).postDelayed({
@@ -135,12 +127,12 @@ class DownloadNotificationManager(
         }
     }
 
-    private fun updateNotificationText(title: String?, text: String, cancelProgressBar: Boolean) {
+    private fun updateNotificationText(title: String?, text: String) {
         notificationBuilder.run {
-            if (cancelProgressBar) {
-                setProgress(0, 0, false)
+            title?.let {
+                setContentTitle(title)
             }
-            setContentTitle(title)
+
             setContentText(text)
             notificationManager.notify(id, this.build())
         }

+ 6 - 20
app/src/main/java/com/nextcloud/client/files/downloader/FileDownloadWorker.kt

@@ -140,13 +140,17 @@ class FileDownloadWorker(
                 downloadFile(it)
             }
 
-            showSuccessNotification()
+            if (isAnyOperationFailed) {
+                notificationManager.dismissNotification()
+            }
+
             setIdleWorkerState()
 
             Log_OC.e(TAG, "FilesDownloadWorker successfully completed")
             Result.success()
         } catch (t: Throwable) {
-            notificationManager.showCompleteNotification(context.getString(R.string.downloader_unexpected_error))
+            notificationManager.dismissNotification()
+            notificationManager.showNewNotification(context.getString(R.string.downloader_unexpected_error))
             Log_OC.e(TAG, "Error caught at FilesDownloadWorker(): " + t.localizedMessage)
             setIdleWorkerState()
             Result.failure()
@@ -183,24 +187,6 @@ class FileDownloadWorker(
         pendingDownloads.remove(accountName)
     }
 
-    @Suppress("MagicNumber")
-    private fun showSuccessNotification() {
-        if (isAnyOperationFailed) {
-            notificationManager.dismissNotification()
-            return
-        }
-
-        val successText = if (folder != null) {
-            context.getString(R.string.downloader_folder_downloaded, folder?.fileName)
-        } else if (currentDownload?.file != null) {
-            context.getString(R.string.downloader_file_downloaded, currentDownload?.file?.fileName)
-        } else {
-            context.getString(R.string.downloader_download_completed)
-        }
-
-        notificationManager.showCompleteNotification(successText)
-    }
-
     private fun getRequestDownloads(): AbstractList<String> {
         workerId = inputData.keyValueMap[WORKER_ID] as Int
         isAnyOperationFailed = false

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

@@ -168,7 +168,6 @@
     <string name="uploads_view_later_waiting_to_upload">Waiting to upload</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_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>
@@ -178,8 +177,6 @@
     <string name="downloader_not_downloaded_yet">Not downloaded yet</string>
     <string name="downloader_file_download_cancelled">%s file download cancelled</string>
     <string name="downloader_file_download_failed">Error occurred while downloading %s file</string>
-    <string name="downloader_folder_downloaded">%s folder successfully downloaded</string>
-    <string name="downloader_file_downloaded">%s file successfully downloaded</string>
     <string name="downloader_unexpected_error">Unexpected error occurred while downloading files</string>
     <string name="downloader_download_failed_credentials_error">Download failed, log in again</string>
     <string name="common_choose_account">Choose account</string>