fix(upload-list): dismiss conflict resolve notification after resolving

Signed-off-by: alperozturk96 <alper_ozturk@proton.me>

Author: alperozturk96

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

@@ -8,6 +8,7 @@
 package com.nextcloud.client.jobs.utils
 
 import android.app.Notification
+import android.app.NotificationManager
 import android.app.PendingIntent
 import android.content.Context
 import android.content.Intent
@@ -32,6 +33,11 @@ import kotlinx.coroutines.withContext
 object UploadErrorNotificationManager {
     private const val TAG = "UploadErrorNotificationManager"
 
+    fun dismissConflictResolveNotification(context: Context, id: Long) {
+        val manager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+        manager.cancel(id.toInt())
+    }
+
     /**
      * Processes the result of an upload operation and manages error notifications.
      * * It filters out successful or silent results and handles [ResultCode.SYNC_CONFLICT], [ResultCode.CONFLICT]

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

@@ -10,7 +10,6 @@
 package com.owncloud.android.ui.activity
 
 import android.annotation.SuppressLint
-import android.app.NotificationManager
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
@@ -24,6 +23,7 @@ import com.nextcloud.client.jobs.operation.FileOperationHelper
 import com.nextcloud.client.jobs.upload.FileUploadHelper
 import com.nextcloud.client.jobs.upload.FileUploadWorker
 import com.nextcloud.client.jobs.upload.UploadNotificationManager
+import com.nextcloud.client.jobs.utils.UploadErrorNotificationManager
 import com.nextcloud.model.HTTPStatusCodes
 import com.nextcloud.utils.extensions.getDecryptedPath
 import com.nextcloud.utils.extensions.getParcelableArgument
@@ -141,7 +141,10 @@ class ConflictsResolveActivity :
                 }
 
                 withContext(Dispatchers.Main) {
-                    dismissConflictResolveNotification()
+                    UploadErrorNotificationManager.dismissConflictResolveNotification(
+                        this@ConflictsResolveActivity,
+                        conflictUploadId
+                    )
                     finish()
                 }
             }
@@ -332,10 +335,6 @@ class ConflictsResolveActivity :
         fileDataStorageManager.saveFile(file)
     }
 
-    private fun dismissConflictResolveNotification() {
-        (getSystemService(NOTIFICATION_SERVICE) as NotificationManager).cancel(conflictUploadId.toInt())
-    }
-
     private fun showErrorAndFinish(code: Int? = null) {
         val message = if (code == HTTPStatusCodes.NOT_FOUND.code) {
             getString(R.string.uploader_file_not_found_on_server_message)

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

@@ -26,6 +26,7 @@ import com.nextcloud.client.core.Clock
 import com.nextcloud.client.device.PowerManagementService
 import com.nextcloud.client.jobs.upload.FileUploadEventBroadcaster
 import com.nextcloud.client.jobs.upload.FileUploadHelper
+import com.nextcloud.client.jobs.utils.UploadErrorNotificationManager
 import com.nextcloud.client.utils.Throttler
 import com.nextcloud.utils.extensions.webDavParentPath
 import com.owncloud.android.R
@@ -343,6 +344,10 @@ class UploadListActivity :
 
             if (result.isSuccess) {
                 withContext(Dispatchers.Main) {
+                    UploadErrorNotificationManager.dismissConflictResolveNotification(
+                        this@UploadListActivity,
+                        upload.uploadId
+                    )
                     uploadListAdapter.loadUploadItemsFromDb()
                 }
             }