add documentation and simplify

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

Author: alperozturk96

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

@@ -1,7 +1,7 @@
 /*
  * Nextcloud - Android Client
  *
- * SPDX-FileCopyrightText: 2023 Alper Ozturk <alper.ozturk@nextcloud.com>
+ * SPDX-FileCopyrightText: 2026 Alper Ozturk <alper.ozturk@nextcloud.com>
  * SPDX-FileCopyrightText: 2023 Nextcloud GmbH
  * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
  */
@@ -25,13 +25,23 @@ import com.owncloud.android.operations.UploadFileOperation
 class FileUploadBroadcastManager(private val broadcastManager: LocalBroadcastManager) {
 
     companion object {
-        private const val TAG =  "📣" + "FileUploadBroadcastManager"
+        private const val TAG = "📣" + "FileUploadBroadcastManager"
 
         const val UPLOAD_ADDED = "UPLOAD_ADDED"
-        const val UPLOAD_STARTED = "UPLOAD_START"
-        const val UPLOAD_FINISHED = "UPLOAD_FINISH"
+        const val UPLOAD_STARTED = "UPLOAD_STARTED"
+        const val UPLOAD_FINISHED = "UPLOAD_FINISHED"
     }
 
+    /**
+     * Sends a broadcast indicating that an upload added
+     *
+     * ### Triggered when
+     * - [UploadFileOperation] added
+     *
+     *  ### Observed by
+     *  - [com.owncloud.android.ui.activity.UploadListActivity.UploadFinishReceiver]
+     *
+     */
     fun sendAdded(context: Context) {
         Log_OC.d(TAG, "upload added broadcast sent")
         val intent = Intent(UPLOAD_ADDED).apply {
@@ -40,10 +50,17 @@ class FileUploadBroadcastManager(private val broadcastManager: LocalBroadcastMan
         broadcastManager.sendBroadcast(intent)
     }
 
-    fun sendStarted(
-        upload: UploadFileOperation,
-        context: Context,
-    ) {
+    /**
+     * Sends a broadcast indicating that an upload started
+     *
+     * ### Triggered when
+     * - [UploadFileOperation] started
+     *
+     *  ### Observed by
+     *  - [com.owncloud.android.ui.activity.UploadListActivity.UploadFinishReceiver]
+     *
+     */
+    fun sendStarted(upload: UploadFileOperation, context: Context) {
         Log_OC.d(TAG, "upload started broadcast sent")
         val intent = Intent(UPLOAD_STARTED).apply {
             putExtra(FileUploadWorker.EXTRA_REMOTE_PATH, upload.remotePath) // real remote

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

@@ -284,8 +284,11 @@ class FileUploadWorker(
         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) {
             fileUploadBroadcastManager.sendFinished(

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

@@ -1670,7 +1670,7 @@ class FileDisplayActivity :
         private val tag = "UploadFinishReceiver"
 
         override fun onReceive(context: Context?, intent: Intent) {
-            Log_OC.d(tag,"upload finish received broadcast")
+            Log_OC.d(tag, "upload finish received broadcast")
 
             val uploadedRemotePath = intent.getStringExtra(FileUploadWorker.EXTRA_REMOTE_PATH)
             val accountName = intent.getStringExtra(FileUploadWorker.ACCOUNT_NAME)

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

@@ -177,9 +177,9 @@ private void refresh() {
     }
 
     @Override
-    protected void onResume() {
-        Log_OC.v(TAG, "onResume() start");
-        super.onResume();
+    protected void onStart() {
+        Log_OC.v(TAG, "onStart() start");
+        super.onStart();
 
         // Listen for upload messages
         uploadFinishReceiver = new UploadFinishReceiver();
@@ -189,19 +189,18 @@ protected void onResume() {
         uploadIntentFilter.addAction(FileUploadBroadcastManager.UPLOAD_FINISHED);
         localBroadcastManager.registerReceiver(uploadFinishReceiver, uploadIntentFilter);
 
-        Log_OC.v(TAG, "onResume() end");
-
+        Log_OC.v(TAG, "onStart() end");
     }
 
     @Override
-    protected void onPause() {
-        Log_OC.v(TAG, "onPause() start");
+    protected void onStop() {
+        Log_OC.v(TAG, "onStop() start");
         if (uploadFinishReceiver != null) {
             localBroadcastManager.unregisterReceiver(uploadFinishReceiver);
             uploadFinishReceiver = null;
         }
-        super.onPause();
-        Log_OC.v(TAG, "onPause() end");
+        super.onStop();
+        Log_OC.v(TAG, "onStop() end");
     }
 
     @Override

app/src/main/java/com/owncloud/android/ui/preview/PreviewImageActivity.kt

@@ -255,6 +255,7 @@ class PreviewImageActivity :
 
     public override fun onStart() {
         super.onStart()
+        registerReceivers()
         val optionalUser = user
         if (optionalUser.isPresent) {
             var file: OCFile? = file ?: throw IllegalStateException("Instanced with a NULL OCFile")
@@ -379,9 +380,7 @@ class PreviewImageActivity :
         }
     }
 
-    override fun onResume() {
-        super.onResume()
-
+    private fun registerReceivers() {
         downloadFinishReceiver = DownloadFinishReceiver()
         val downloadIntentFilter = IntentFilter(getDownloadFinishMessage())
         localBroadcastManager.registerReceiver(downloadFinishReceiver!!, downloadIntentFilter)
@@ -391,13 +390,13 @@ class PreviewImageActivity :
         localBroadcastManager.registerReceiver(uploadFinishReceiver, uploadIntentFilter)
     }
 
-    public override fun onPause() {
+    public override fun onStop() {
         if (downloadFinishReceiver != null) {
             localBroadcastManager.unregisterReceiver(downloadFinishReceiver!!)
             downloadFinishReceiver = null
         }
 
-        super.onPause()
+        super.onStop()
     }
 
     private fun backToDisplayActivity() {