fix(receivers): upload

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

Author: alperozturk96

…ient/jobs/upload/FileUploaderDelegate.kt …obs/upload/FileUploadBroadcastManager.ktapp/src/main/java/com/nextcloud/client/jobs/upload/FileUploaderDelegate.kt renamed to app/src/main/java/com/nextcloud/client/jobs/upload/FileUploadBroadcastManager.kt app/src/main/java/com/nextcloud/client/jobs/upload/FileUploaderDelegate.kt renamed to app/src/main/java/com/nextcloud/client/jobs/upload/FileUploadBroadcastManager.kt

@@ -13,54 +13,31 @@ import androidx.localbroadcastmanager.content.LocalBroadcastManager
 import com.owncloud.android.lib.common.operations.RemoteOperationResult
 import com.owncloud.android.operations.UploadFileOperation
 
-class FileUploaderDelegate {
-    /**
-     * Sends a broadcast in order to the interested activities can update their view
-     *
-     * TODO - no more broadcasts, replace with a callback to subscribed listeners once we drop FileUploader
-     */
-    fun sendBroadcastUploadsAdded(context: Context, localBroadcastManager: LocalBroadcastManager) {
+class FileUploadBroadcastManager(private val broadcastManager: LocalBroadcastManager) {
+
+    fun sendAdded(context: Context) {
         val start = Intent(FileUploadWorker.getUploadsAddedMessage())
-        // nothing else needed right now
         start.setPackage(context.packageName)
-        localBroadcastManager.sendBroadcast(start)
+        broadcastManager.sendBroadcast(start)
     }
 
-    /**
-     * Sends a broadcast in order to the interested activities can update their view
-     *
-     * TODO - no more broadcasts, replace with a callback to subscribed listeners once we drop FileUploader
-     *
-     * @param upload Finished upload operation
-     */
-    fun sendBroadcastUploadStarted(
+    fun sendStarted(
         upload: UploadFileOperation,
         context: Context,
-        localBroadcastManager: LocalBroadcastManager
     ) {
         val start = Intent(FileUploadWorker.getUploadStartMessage())
         start.putExtra(FileUploadWorker.EXTRA_REMOTE_PATH, upload.remotePath) // real remote
         start.putExtra(FileUploadWorker.EXTRA_OLD_FILE_PATH, upload.originalStoragePath)
         start.putExtra(FileUploadWorker.ACCOUNT_NAME, upload.user.accountName)
         start.setPackage(context.packageName)
-        localBroadcastManager.sendBroadcast(start)
+        broadcastManager.sendBroadcast(start)
     }
 
-    /**
-     * Sends a broadcast in order to the interested activities can update their view
-     *
-     * TODO - no more broadcasts, replace with a callback to subscribed listeners once we drop FileUploader
-     *
-     * @param upload                 Finished upload operation
-     * @param uploadResult           Result of the upload operation
-     * @param unlinkedFromRemotePath Path in the uploads tree where the upload was unlinked from
-     */
-    fun sendBroadcastUploadFinished(
+    fun sendFinished(
         upload: UploadFileOperation,
         uploadResult: RemoteOperationResult<*>,
         unlinkedFromRemotePath: String?,
-        context: Context,
-        localBroadcastManager: LocalBroadcastManager
+        context: Context
     ) {
         val end = Intent(FileUploadWorker.getUploadFinishMessage())
         // real remote path, after possible automatic renaming
@@ -75,6 +52,6 @@ class FileUploaderDelegate {
             end.putExtra(FileUploadWorker.EXTRA_LINKED_TO_PATH, unlinkedFromRemotePath)
         }
         end.setPackage(context.packageName)
-        localBroadcastManager.sendBroadcast(end)
+        broadcastManager.sendBroadcast(end)
     }
 }

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

@@ -131,7 +131,7 @@ class FileUploadWorker(
     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, "FileUploadWorker started")
@@ -206,10 +206,6 @@ class FileUploadWorker(
         notificationManager.dismissNotification()
     }
 
-    private fun setWorkerState(user: User?) {
-        WorkerStateObserver.send(WorkerState.FileUploadStarted(user))
-    }
-
     private fun setIdleWorkerState() {
         WorkerStateObserver.send(WorkerState.FileUploadCompleted(currentUploadFileOperation?.file))
     }
@@ -269,9 +265,9 @@ class FileUploadWorker(
                 return@withContext Result.failure()
             }
 
-            setWorkerState(user)
             val operation = createUploadFileOperation(upload, user)
             currentUploadFileOperation = operation
+            fileUploadBroadcastManager.sendStarted(operation, context)
 
             val currentIndex = (index + 1)
             val currentUploadIndex = (currentIndex + previouslyUploadedFileSize)
@@ -312,12 +308,11 @@ class FileUploadWorker(
 
         if (shouldBroadcast) {
             // delay broadcast
-            fileUploaderDelegate.sendBroadcastUploadFinished(
+            fileUploadBroadcastManager.sendFinished(
                 operation,
                 result,
                 operation.oldFile?.storagePath,
-                context,
-                localBroadcastManager
+                context
             )
         }
     }

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

@@ -28,8 +28,6 @@
 import com.nextcloud.client.jobs.upload.FileUploadHelper;
 import com.nextcloud.client.jobs.upload.FileUploadWorker;
 import com.nextcloud.client.utils.Throttler;
-import com.nextcloud.model.WorkerState;
-import com.nextcloud.utils.extensions.ActivityExtensionsKt;
 import com.owncloud.android.R;
 import com.owncloud.android.databinding.UploadListLayoutBinding;
 import com.owncloud.android.datamodel.OCFile;
@@ -49,7 +47,6 @@
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import kotlin.Unit;
 
 /**
  * Activity listing pending, active, and completed uploads. User can delete completed uploads from view. Content of this
@@ -126,19 +123,6 @@ protected void onCreate(Bundle savedInstanceState) {
         setupDrawer();
 
         setupContent();
-        observeWorkerState();
-    }
-
-    private void observeWorkerState() {
-        ActivityExtensionsKt.observeWorker(this, state -> {
-            if (state instanceof WorkerState.FileUploadStarted) {
-                Log_OC.d(TAG, "Upload worker started");
-                uploadListAdapter.loadUploadItemsFromDb();
-            } else if (state instanceof WorkerState.FileUploadCompleted) {
-                uploadListAdapter.loadUploadItemsFromDb(() -> swipeListRefreshLayout.setRefreshing(false));
-            }
-            return Unit.INSTANCE;
-        });
     }
 
     private void setupContent() {