fixes download all images in e2ee folder

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

Author: alperozturk96

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

@@ -10,7 +10,6 @@ package com.nextcloud.client.jobs.folderDownload
 import android.content.Context
 import android.content.Intent
 import androidx.localbroadcastmanager.content.LocalBroadcastManager
-import com.nextcloud.client.jobs.download.FileDownloadEventBroadcaster
 import com.owncloud.android.lib.common.utils.Log_OC
 
 class FolderDownloadEventBroadcaster(
@@ -28,7 +27,7 @@ class FolderDownloadEventBroadcaster(
         const val EXTRA_FILE_ID = ARG_PREFIX + "EXTRA_FILE_ID"
     }
 
-    fun sendAdded(id: Long) {
+    fun sendDownloadEnqueued(id: Long) {
         Log_OC.d(TAG, "Download enqueued broadcast sent")
 
         val intent = Intent(ACTION_DOWNLOAD_ENQUEUED).apply {
@@ -38,7 +37,7 @@ class FolderDownloadEventBroadcaster(
         broadcastManager.sendBroadcast(intent)
     }
 
-    fun sendFinished(id: Long) {
+    fun sendDownloadCompleted(id: Long) {
         Log_OC.d(TAG, "Download completed broadcast sent")
 
         val intent = Intent(ACTION_DOWNLOAD_COMPLETED).apply {

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

@@ -80,7 +80,7 @@ class FolderDownloadWorker(
 
         trySetForeground(folder)
 
-        folderDownloadEventBroadcaster.sendAdded(folder.fileId)
+        folderDownloadEventBroadcaster.sendDownloadEnqueued(folder.fileId)
         pendingDownloads.add(folder.fileId)
 
         val downloadHelper = FileDownloadHelper.instance()
@@ -138,7 +138,7 @@ class FolderDownloadWorker(
                 Log_OC.d(TAG, "❌ failed reason: $e")
                 Result.failure()
             } finally {
-                folderDownloadEventBroadcaster.sendFinished(folder.fileId)
+                folderDownloadEventBroadcaster.sendDownloadCompleted(folder.fileId)
                 pendingDownloads.remove(folder.fileId)
                 notificationManager.dismiss()
             }

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

@@ -415,8 +415,7 @@ class PreviewImageActivity :
         showDetails(file)
     }
 
-    @JvmOverloads
-    fun requestForDownload(file: OCFile?, downloadBehaviour: String? = null) {
+    fun requestForDownload(file: OCFile?) {
         if (file == null) return
         val user = user.orElseThrow { RuntimeException() }
         FileDownloadHelper.instance().downloadFileIfNotStartedBefore(user, file)
@@ -469,18 +468,20 @@ class PreviewImageActivity :
      */
     private inner class DownloadFinishReceiver : BroadcastReceiver() {
         override fun onReceive(context: Context, intent: Intent) {
-            /*
-             Log_OC.d(TAG, "Download worker stopped")
+            Log_OC.d(TAG, "Download worker stopped")
             isDownloadWorkStarted = false
+            val accountName = intent.getStringExtra(FileDownloadEventBroadcaster.EXTRA_ACCOUNT_NAME)
+            val downloadedRemotePath = intent.getStringExtra(FileDownloadEventBroadcaster.EXTRA_REMOTE_PATH)
+            if (account.name != accountName || downloadedRemotePath == null) {
+                return
+            }
+            val file = storageManager.getFileByEncryptedRemotePath(downloadedRemotePath)
 
             if (screenState == PreviewImageActivityState.Edit) {
-                onImageDownloadComplete(state.currentFile)
+                onImageDownloadComplete(file)
             } else {
                 setDownloadedItem()
             }
-             */
-
-            previewNewImage(intent)
         }
     }
 
@@ -495,45 +496,6 @@ class PreviewImageActivity :
         }
     }
 
-    @Suppress("NestedBlockDepth", "ReturnCount")
-    private fun previewNewImage(intent: Intent) {
-        val accountName = intent.getStringExtra(FileDownloadEventBroadcaster.EXTRA_ACCOUNT_NAME)
-        val downloadedRemotePath = intent.getStringExtra(FileDownloadEventBroadcaster.EXTRA_REMOTE_PATH)
-        val downloadBehaviour = intent.getStringExtra(FileDownloadEventBroadcaster.EXTRA_DOWNLOAD_BEHAVIOUR)
-
-        if (account.name != accountName || downloadedRemotePath == null) {
-            return
-        }
-
-        val file = storageManager.getFileByEncryptedRemotePath(downloadedRemotePath)
-        val downloadWasFine = intent.getBooleanExtra(FileDownloadEventBroadcaster.EXTRA_DOWNLOAD_RESULT, false)
-
-        if (EditImageActivity.OPEN_IMAGE_EDITOR == downloadBehaviour) {
-            startImageEditor(file)
-        } else {
-            val position = previewImagePagerAdapter?.getFilePosition(file) ?: return
-
-            if (position >= 0) {
-                if (downloadWasFine) {
-                    previewImagePagerAdapter?.updateFile(position, file)
-                } else {
-                    previewImagePagerAdapter?.updateWithDownloadError(position)
-                }
-                previewImagePagerAdapter?.notifyItemChanged(position)
-            } else if (downloadWasFine) {
-                val user = user
-
-                if (user.isPresent) {
-                    initViewPager(user.get())
-                    val newPosition = previewImagePagerAdapter?.getFilePosition(file) ?: return
-                    if (newPosition >= 0) {
-                        viewPager?.currentItem = newPosition
-                    }
-                }
-            }
-        }
-    }
-
     val isSystemUIVisible: Boolean
         get() = supportActionBar == null || supportActionBar?.isShowing == true
 
@@ -554,7 +516,7 @@ class PreviewImageActivity :
         } else {
             showLoadingDialog(getString(R.string.preview_image_downloading_image_for_edit))
             screenState = PreviewImageActivityState.Edit
-            requestForDownload(file, EditImageActivity.OPEN_IMAGE_EDITOR)
+            requestForDownload(file)
         }
     }