fix notification error id handling

Signed-off-by: alperozturk <[email protected]>

Author: alperozturk96

app/src/main/java/com/nextcloud/client/jobs/autoUpload/AutoUploadWorker.kt

@@ -63,7 +63,7 @@ class AutoUploadWorker(
     private val syncedFolderProvider: SyncedFolderProvider,
     private val backgroundJobManager: BackgroundJobManager,
     private val repository: FileSystemRepository,
-    val viewThemeUtils: ViewThemeUtils,
+    val viewThemeUtils: ViewThemeUtils
 ) : CoroutineWorker(context, params) {
 
     companion object {

app/src/main/java/com/nextcloud/client/jobs/upload/FileUploadBroadcastReceiver.kt

@@ -8,12 +8,12 @@
 package com.nextcloud.client.jobs.upload
 
 import android.app.NotificationManager
+import android.app.PendingIntent
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import com.owncloud.android.MainApp
 import com.owncloud.android.datamodel.UploadsStorageManager
-import com.owncloud.android.ui.notifications.NotificationUtils
 import javax.inject.Inject
 
 class FileUploadBroadcastReceiver : BroadcastReceiver() {
@@ -22,27 +22,35 @@ class FileUploadBroadcastReceiver : BroadcastReceiver() {
     lateinit var uploadsStorageManager: UploadsStorageManager
 
     companion object {
-        const val UPLOAD_ID = "UPLOAD_ID"
-        const val REMOTE_PATH = "REMOTE_PATH"
-        const val STORAGE_PATH = "STORAGE_PATH"
+        private const val UPLOAD_ID = "UPLOAD_ID"
+
+        fun getBroadcast(context: Context, id: Int): PendingIntent {
+            val intent = Intent(context, FileUploadBroadcastReceiver::class.java).apply {
+                putExtra(UPLOAD_ID, id)
+                setClass(context, FileUploadBroadcastReceiver::class.java)
+                setPackage(context.packageName)
+            }
+
+            return PendingIntent.getBroadcast(
+                context,
+                id,
+                intent,
+                PendingIntent.FLAG_IMMUTABLE
+            )
+        }
     }
 
     @Suppress("ReturnCount")
     override fun onReceive(context: Context, intent: Intent) {
         MainApp.getAppComponent().inject(this)
 
-        val remotePath = intent.getStringExtra(REMOTE_PATH) ?: return
-        val storagePath = intent.getStringExtra(STORAGE_PATH) ?: return
         val uploadId = intent.getLongExtra(UPLOAD_ID, -1L)
         if (uploadId == -1L) {
             return
         }
 
         uploadsStorageManager.removeUpload(uploadId)
         val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-        notificationManager.cancel(
-            NotificationUtils.createUploadNotificationTag(remotePath, storagePath),
-            FileUploadWorker.NOTIFICATION_ERROR_ID
-        )
+        notificationManager.cancel(uploadId.toInt())
     }
 }

app/src/main/java/com/nextcloud/client/jobs/upload/FileUploadWorker.kt

@@ -353,7 +353,7 @@ class FileUploadWorker(
                     notificationManager,
                     operation,
                     result,
-                    showSameFileAlreadyExistsNotification =  {
+                    showSameFileAlreadyExistsNotification = {
                         withContext(Dispatchers.Main) {
                             val showSameFileAlreadyExistsNotification =
                                 inputData.getBoolean(SHOW_SAME_FILE_ALREADY_EXISTS_NOTIFICATION, false)

app/src/main/java/com/nextcloud/client/jobs/utils/UploadErrorNotificationManager.kt

@@ -27,7 +27,6 @@ import com.owncloud.android.utils.ErrorMessageAdapter
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import java.io.File
-import java.security.SecureRandom
 
 object UploadErrorNotificationManager {
     private const val TAG = "UploadErrorNotificationManager"
@@ -38,7 +37,7 @@ object UploadErrorNotificationManager {
         operation: UploadFileOperation,
         result: RemoteOperationResult<Any?>,
         showSameFileAlreadyExistsNotification: suspend () -> Unit = {}
-    )  {
+    ) {
         Log_OC.d(TAG, "handle upload result with result code: " + result.code)
 
         val notification = withContext(Dispatchers.IO) {
@@ -66,7 +65,7 @@ object UploadErrorNotificationManager {
 
         withContext(Dispatchers.Main) {
             if (result.code.isFileSpecificError()) {
-                notificationManager.showNotification(operation.file.fileId.toInt(), notification)
+                notificationManager.showNotification(operation.ocUploadId.toInt(), notification)
             } else {
                 notificationManager.showNotification(notification)
             }
@@ -106,7 +105,7 @@ object UploadErrorNotificationManager {
                 addAction(
                     R.drawable.ic_delete,
                     context.getString(R.string.upload_list_cancel_upload),
-                    cancelUploadPendingIntent(context, operation)
+                    FileUploadBroadcastReceiver.getBroadcast(context, operation.ocUploadId.toInt())
                 )
             }
 
@@ -147,31 +146,19 @@ object UploadErrorNotificationManager {
         val intent = ConflictsResolveActivity.createIntent(
             operation.file,
             operation.user,
-            operation.ocUploadId,
+            conflictUploadId = operation.ocUploadId,
             Intent.FLAG_ACTIVITY_CLEAR_TOP,
             context
         ).apply {
             setClass(context, ConflictsResolveActivity::class.java)
             setPackage(context.packageName)
         }
 
-        return PendingIntent.getActivity(context, SecureRandom().nextInt(), intent, PendingIntent.FLAG_IMMUTABLE)
-    }
-
-    private fun cancelUploadPendingIntent(context: Context, operation: UploadFileOperation): PendingIntent {
-        val intent = Intent(context, FileUploadBroadcastReceiver::class.java).apply {
-            putExtra(FileUploadBroadcastReceiver.UPLOAD_ID, operation.ocUploadId)
-            putExtra(FileUploadBroadcastReceiver.REMOTE_PATH, operation.file.remotePath)
-            putExtra(FileUploadBroadcastReceiver.STORAGE_PATH, operation.file.storagePath)
-            setClass(context, FileUploadBroadcastReceiver::class.java)
-            setPackage(context.packageName)
-        }
-
-        return PendingIntent.getBroadcast(
+        return PendingIntent.getActivity(
             context,
-            operation.file.fileId.toInt(),
+            operation.ocUploadId.toInt(),
             intent,
-            PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
+            PendingIntent.FLAG_IMMUTABLE
         )
     }
 

app/src/main/java/com/owncloud/android/ui/activity/ConflictsResolveActivity.kt

@@ -130,7 +130,7 @@ class ConflictsResolveActivity :
                 updateThumbnailIfNeeded(decision, file, oldFile)
             }
 
-            dismissConflictResolveNotification(file)
+            dismissConflictResolveNotification()
             finish()
         }
     }
@@ -148,13 +148,9 @@ class ConflictsResolveActivity :
         }
     }
 
-    // notification id must be file id because only if upload failed via SYNC_CONFLICT can create conflict
-    // resolve activity
-    private fun dismissConflictResolveNotification(file: OCFile?) {
-        file?.let {
-            val notificationManager = getSystemService(NOTIFICATION_SERVICE) as NotificationManager
-            notificationManager.cancel(file.fileId.toInt())
-        }
+    private fun dismissConflictResolveNotification() {
+        val notificationManager = getSystemService(NOTIFICATION_SERVICE) as NotificationManager
+        notificationManager.cancel(conflictUploadId.toInt())
     }
 
     private fun keepBothFolder(offlineOperation: OfflineOperationEntity?, serverFile: OCFile?) {