album upload worker state handled via localbroadcastmanager

Signed-off-by: Surinder Kumar <surinder.kumar@t-systems.com>

Author: surinder-tsys

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

@@ -88,7 +88,7 @@ class AlbumFileUploadWorker(
     private val notificationId = Random.nextInt()
     private val notificationManager = UploadNotificationManager(context, viewThemeUtils, notificationId)
     private val intents = FileUploaderIntents(context)
-    private val fileUploaderDelegate = FileUploaderDelegate()
+    private val fileUploadBroadcastManager = FileUploadBroadcastManager(localBroadcastManager)
 
     override suspend fun doWork(): Result = try {
         Log_OC.d(TAG, "AlbumFileUploadWorker started")
@@ -100,14 +100,15 @@ class AlbumFileUploadWorker(
         val result = uploadFiles()
         backgroundJobManager.logEndOfWorker(workerName, result)
         notificationManager.dismissNotification()
-        if (result == Result.success()) {
-            setIdleWorkerState()
-        }
         result
     } catch (t: Throwable) {
-        Log_OC.e(TAG, "Error caught at AlbumFileUploadWorker $t")
-        cleanup()
+        Log_OC.e(TAG, "exception $t")
+        currentUploadFileOperation?.cancel(null)
         Result.failure()
+    } finally {
+        // Ensure all database operations are complete before signaling completion
+        uploadsStorageManager.notifyObserversNow()
+        notificationManager.dismissNotification()
     }
 
     private suspend fun trySetForeground() {
@@ -155,22 +156,6 @@ class AlbumFileUploadWorker(
             .setSilent(true)
             .build()
 
-    private fun cleanup() {
-        Log_OC.e(TAG, "AlbumFileUploadWorker stopped")
-
-        setIdleWorkerState()
-        currentUploadFileOperation?.cancel(null)
-        notificationManager.dismissNotification()
-    }
-
-    private fun setWorkerState(user: User?) {
-        WorkerStateObserver.send(WorkerState.FileUploadStarted(user))
-    }
-
-    private fun setIdleWorkerState() {
-        WorkerStateObserver.send(WorkerState.FileUploadCompleted(currentUploadFileOperation?.file))
-    }
-
     @Suppress("ReturnCount", "LongMethod", "DEPRECATION")
     private suspend fun uploadFiles(): Result = withContext(Dispatchers.IO) {
         val accountName = inputData.getString(ACCOUNT)
@@ -232,7 +217,7 @@ class AlbumFileUploadWorker(
                 return@withContext Result.failure()
             }
 
-            setWorkerState(user)
+            fileUploadBroadcastManager.sendAdded(context)
             val operation = createUploadFileOperation(upload, user)
             currentUploadFileOperation = operation
 
@@ -270,17 +255,18 @@ class AlbumFileUploadWorker(
         operation: UploadFileOperation,
         result: RemoteOperationResult<*>
     ) {
+        val isLastUpload = currentUploadIndex == totalUploadSize
+
         val shouldBroadcast =
-            (totalUploadSize > BATCH_SIZE && currentUploadIndex > 0) && currentUploadIndex % BATCH_SIZE == 0
+            (currentUploadIndex % BATCH_SIZE == 0 && totalUploadSize > BATCH_SIZE) ||
+                isLastUpload
 
         if (shouldBroadcast) {
-            // delay broadcast
-            fileUploaderDelegate.sendBroadcastUploadFinished(
+            fileUploadBroadcastManager.sendFinished(
                 operation,
                 result,
                 operation.oldFile?.storagePath,
-                context,
-                localBroadcastManager
+                context
             )
         }
     }
@@ -341,13 +327,14 @@ class AlbumFileUploadWorker(
             } else {
                 Log_OC.e(TAG, "Failed to copy file to Album: $albumName due to ${copyResult.logMessage}")
             }
+            fileUploadBroadcastManager.sendStarted(operation, context)
         } catch (e: Exception) {
             Log_OC.e(TAG, "Error uploading", e)
             result = RemoteOperationResult<Any?>(e)
         } finally {
             if (!isStopped) {
                 uploadsStorageManager.updateDatabaseUploadResult(result, operation)
-                // NMC: resolving file conflict will trigger normal file upload and shows two upload process
+                // resolving file conflict will trigger normal file upload and shows two upload process
                 // one for normal and one for Album upload
                 // as customizing conflict can break normal upload
                 // so we are removing the upload if it's a conflict

app/src/main/java/com/owncloud/android/ui/adapter/GalleryAdapter.kt

@@ -259,14 +259,6 @@ class GalleryAdapter(
         notifyDataSetChanged()
     }
 
-    @SuppressLint("NotifyDataSetChanged")
-    fun showAlbumItems(
-        albumItems: List<OCFile>,
-    ) {
-        files = albumItems.toGalleryItems()
-        Handler(Looper.getMainLooper()).post { notifyDataSetChanged() }
-    }
-
     private fun transformToRows(list: List<OCFile>): List<GalleryRow> {
         if (list.isEmpty()) return emptyList()
 

app/src/main/java/com/owncloud/android/ui/dialog/CreateAlbumDialogFragment.kt

@@ -99,7 +99,6 @@ class CreateAlbumDialogFragment :
         val inflater = requireActivity().layoutInflater
         binding = EditBoxDialogBinding.inflate(inflater, null, false)
 
-
         binding.userInput.setText(albumName ?: "")
         viewThemeUtils.material.colorTextInputLayout(binding.userInputContainer)
         albumName?.let {

app/src/main/java/com/owncloud/android/ui/fragment/albums/AlbumItemsFragment.kt

@@ -91,7 +91,6 @@ import com.owncloud.android.ui.preview.PreviewImageFragment
 import com.owncloud.android.ui.preview.PreviewMediaActivity.Companion.canBePreviewed
 import com.owncloud.android.utils.DisplayUtils
 import com.owncloud.android.utils.ErrorMessageAdapter
-import com.owncloud.android.utils.FileStorageUtils
 import com.owncloud.android.utils.theme.ViewThemeUtils
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.FlowPreview
@@ -270,8 +269,7 @@ class AlbumItemsFragment :
                         true
                     }
 
-                        else -> false
-                    }
+                    else -> false
                 }
 
                 override fun onPrepareMenu(menu: Menu) {
@@ -333,7 +331,6 @@ class AlbumItemsFragment :
         binding.listRoot.setEmptyView(binding.emptyList.emptyListView)
         val layoutManager = GridLayoutManager(requireContext(), 1)
         binding.listRoot.layoutManager = layoutManager
-        fetchAndSetData()
     }
 
     private fun setupContainingList() {
@@ -382,7 +379,6 @@ class AlbumItemsFragment :
 
                         contentValues.add(cv)
                     }
-                    ocFileList.add(ocFile!!)
                 }
 
                 mContainerActivity?.storageManager?.saveVirtuals(contentValues)
@@ -520,7 +516,6 @@ class AlbumItemsFragment :
     override fun onDestroyView() {
         lastMediaItemPosition = 0
         super.onDestroyView()
-        lastMediaItemPosition = 0
     }
 
     override fun getColumnsCount(): Int = columnSize