From d6201cf796bd0071a2bfc3dcd6f6322f70cb27ed Mon Sep 17 00:00:00 2001
From: parneet-guraya <gurayaparneet@gmail.com>
Date: Wed, 10 Jan 2024 01:56:36 +0530
Subject: [PATCH] use new builder for failure notification
Signed-off-by: parneet-guraya <gurayaparneet@gmail.com>
---
.../talk/jobs/UploadAndShareFilesWorker.kt | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/app/src/main/java/com/nextcloud/talk/jobs/UploadAndShareFilesWorker.kt b/app/src/main/java/com/nextcloud/talk/jobs/UploadAndShareFilesWorker.kt
index 9a42ea03f..1033d6722 100644
--- a/app/src/main/java/com/nextcloud/talk/jobs/UploadAndShareFilesWorker.kt
+++ b/app/src/main/java/com/nextcloud/talk/jobs/UploadAndShareFilesWorker.kt
@@ -268,7 +268,7 @@ class UploadAndShareFilesWorker(val context: Context, workerParameters: WorkerPa
mNotifyManager?.cancel(notificationId)
// summary notification would not get dismissed automatically if child notifications are cancelled programmatically
// so check if only 1 notification left if yes then cancel it because that would be summary notification
- if(getActiveUploadNotifications() == 1){
+ if (getActiveUploadNotifications() == 1) {
mNotifyManager?.cancel(NotificationUtils.GROUP_SUMMARY_NOTIFICATION_ID)
}
}
@@ -321,17 +321,20 @@ class UploadAndShareFilesWorker(val context: Context, workerParameters: WorkerPa
getResourceString(context, R.string.nc_upload_failed_notification_text),
fileName
)
- notification = mBuilder!!
+ val failureNotification = NotificationCompat.Builder(
+ context, NotificationUtils.NotificationChannels
+ .NOTIFICATION_CHANNEL_UPLOADS.name
+ )
.setContentTitle(failureTitle)
.setContentText(failureText)
.setSmallIcon(R.drawable.baseline_error_24)
+ .setGroup(NotificationUtils.KEY_UPLOAD_GROUP)
.setOngoing(false)
.build()
- // Cancel original notification
mNotifyManager?.cancel(notificationId)
- // Then show information about failure
- mNotifyManager!!.notify(SystemClock.uptimeMillis().toInt(), notification)
+ // update current notification with failure info
+ mNotifyManager!!.notify(SystemClock.uptimeMillis().toInt(), failureNotification)
}
private fun getResourceString(context: Context, resourceId: Int): String {