feat(sync-all): show notifications

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

Author: alperozturk96

app/src/main/java/com/nextcloud/client/jobs/folderDownload/FolderDownloadWorker.kt

@@ -47,7 +47,7 @@ class FolderDownloadWorker(
         fun isDownloading(id: Long): Boolean = pendingDownloads.contains(id)
     }
 
-    private val notificationManager = FolderDownloadWorkerNotificationManager(context, viewThemeUtils)
+    private val notificationManager = FolderDownloadWorkerNotificationManager(context, true, viewThemeUtils)
     private val folderDownloadEventBroadcaster = FolderDownloadEventBroadcaster(context, localBroadcastManager)
     private lateinit var storageManager: FileDataStorageManager
 
@@ -112,15 +112,12 @@ class FolderDownloadWorker(
                         return@withContext Result.failure()
                     }
 
-                    withContext(Dispatchers.Main) {
-                        val notification = notificationManager.getProgressNotification(
-                            folder.fileName,
-                            file.fileName,
-                            index,
-                            files.size
-                        )
-                        notificationManager.showNotification(notification)
-                    }
+                    notificationManager.showProgressNotification(
+                        folder.fileName,
+                        file.fileName,
+                        index,
+                        files.size
+                    )
 
                     val operation = DownloadFileOperation(user, file, context)
                     val operationResult = operation.execute(client)

app/src/main/java/com/nextcloud/client/jobs/folderDownload/FolderDownloadWorkerNotificationManager.kt

@@ -13,6 +13,7 @@ import android.content.Context
 import android.content.Intent
 import androidx.work.ForegroundInfo
 import com.nextcloud.client.jobs.notification.WorkerNotificationManager
+import com.nextcloud.utils.extensions.mainThread
 import com.owncloud.android.R
 import com.owncloud.android.datamodel.OCFile
 import com.owncloud.android.ui.notifications.NotificationUtils
@@ -21,7 +22,11 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import kotlin.random.Random
 
-class FolderDownloadWorkerNotificationManager(private val context: Context, viewThemeUtils: ViewThemeUtils) :
+class FolderDownloadWorkerNotificationManager(
+    private val context: Context,
+    private val showCancel: Boolean = true,
+    viewThemeUtils: ViewThemeUtils?
+) :
     WorkerNotificationManager(
         id = NOTIFICATION_ID,
         context,
@@ -42,7 +47,7 @@ class FolderDownloadWorkerNotificationManager(private val context: Context, view
             clearActions()
             setContentText(description)
 
-            if (progress != null) {
+            if (progress != null && showCancel) {
                 setProgress(MAX_PROGRESS, progress, false)
                 addAction(
                     R.drawable.ic_cancel,
@@ -68,29 +73,35 @@ class FolderDownloadWorkerNotificationManager(private val context: Context, view
     }
 
     @Suppress("MagicNumber")
-    fun getProgressNotification(
+    fun showProgressNotification(
         folderName: String,
         filename: String,
         currentIndex: Int,
         totalFileSize: Int
-    ): Notification {
-        val currentFileIndex = (currentIndex + 1)
-        val description = context.getString(R.string.folder_download_counter, currentFileIndex, totalFileSize, filename)
-        val progress = (currentFileIndex * MAX_PROGRESS) / totalFileSize
-        return getNotification(folderName, description, progress)
+    ) {
+        mainThread(delay = 0) {
+            val currentFileIndex = (currentIndex + 1)
+            val description =
+                context.getString(R.string.folder_download_counter, currentFileIndex, totalFileSize, filename)
+            val progress = (currentFileIndex * MAX_PROGRESS) / totalFileSize
+            val notification = getNotification(folderName, description, progress)
+            showNotification(notification)
+        }
     }
 
-    suspend fun showCompletionNotification(folderName: String, success: Boolean) = withContext(Dispatchers.Main) {
-        val titleId = if (success) {
-            R.string.folder_download_success_notification_title
-        } else {
-            R.string.folder_download_error_notification_title
-        }
+    fun showCompletionNotification(folderName: String, success: Boolean) {
+        mainThread(delay = 0) {
+            val titleId = if (success) {
+                R.string.folder_download_success_notification_title
+            } else {
+                R.string.folder_download_error_notification_title
+            }
 
-        val title = context.getString(titleId, folderName)
+            val title = context.getString(titleId, folderName)
 
-        val notification = getNotification(title)
-        notificationManager.notify(NOTIFICATION_ID, notification)
+            val notification = getNotification(title)
+            notificationManager.notify(NOTIFICATION_ID, notification)
+        }
     }
 
     suspend fun showNotAvailableDiskSpace() = withContext(Dispatchers.Main) {

app/src/main/java/com/owncloud/android/operations/SynchronizeFolderOperation.java

@@ -16,6 +16,7 @@
 
 import com.nextcloud.client.account.User;
 import com.nextcloud.client.jobs.download.FileDownloadHelper;
+import com.nextcloud.client.jobs.folderDownload.FolderDownloadWorkerNotificationManager;
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.datamodel.e2e.v1.decrypted.DecryptedFolderMetadataFileV1;
@@ -29,7 +30,6 @@
 import com.owncloud.android.lib.resources.files.ReadFolderRemoteOperation;
 import com.owncloud.android.lib.resources.files.model.RemoteFile;
 import com.owncloud.android.operations.common.SyncOperation;
-import com.owncloud.android.operations.manager.SynchronizeFileNotificationManager;
 import com.owncloud.android.services.OperationsService;
 import com.owncloud.android.utils.FileStorageUtils;
 import com.owncloud.android.utils.MimeTypeUtil;
@@ -91,7 +91,7 @@ public class SynchronizeFolderOperation extends SyncOperation {
 
     private final boolean syncAll;
 
-    final SynchronizeFileNotificationManager notificationManager;
+    final FolderDownloadWorkerNotificationManager notificationManager;
 
     /**
      * Creates a new instance of {@link SynchronizeFolderOperation}.
@@ -117,7 +117,7 @@ public SynchronizeFolderOperation(Context context,
         mCancellationRequested = new AtomicBoolean(false);
         this.useWorkerWithNotification = useWorkerWithNotification;
         this.syncAll = syncAll;
-        notificationManager = new SynchronizeFileNotificationManager(context, null);
+        notificationManager = new FolderDownloadWorkerNotificationManager(context, false,null);
     }
 
 
@@ -525,6 +525,7 @@ private void startContentSynchronizations(List<SynchronizeFileOperation> filesTo
         int total = filesToSyncContents.size();
         int current = 0;
         boolean success = true;
+        String folderName = mLocalFolder.getFileName();
 
         for (SynchronizeFileOperation op: filesToSyncContents) {
             if (mCancellationRequested.get()) {
@@ -534,10 +535,9 @@ private void startContentSynchronizations(List<SynchronizeFileOperation> filesTo
             contentsResult = op.execute(mContext);
             current++;
 
-            int progress = (int) ((current * 100.0f) / total);
             final var file = op.getLocalFile();
             if (file != null) {
-                notificationManager.showProgress(file.getFileName(), progress);
+                notificationManager.showProgressNotification(folderName, file.getFileName(), current, total);
             }
 
             if (!contentsResult.isSuccess()) {
@@ -558,7 +558,7 @@ private void startContentSynchronizations(List<SynchronizeFileOperation> filesTo
         }
 
         // FIXME:  NOT DISPLAYING
-        notificationManager.showCompletion(mLocalFolder.getFileName(), success);
+        notificationManager.showCompletionNotification(folderName, success);
     }
 
     /**