Merge pull request #16530 from nextcloud/backport/16529/stable-3.36

[stable-3.36] fix(media): photo search event

Author: alperozturk96

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

@@ -1935,18 +1935,17 @@ class FileDisplayActivity :
     }
 
     fun previewImageWithSearchContext(file: OCFile, searchFragment: Boolean, currentSearchType: SearchType?) {
-        // preview image - it handles the download, if needed
-        if (searchFragment) {
-            val type = when (currentSearchType) {
+        val type = if (searchFragment) {
+            when (currentSearchType) {
                 SearchType.FAVORITE_SEARCH -> VirtualFolderType.FAVORITE
                 SearchType.GALLERY_SEARCH -> VirtualFolderType.GALLERY
                 else -> VirtualFolderType.NONE
             }
-
-            startImagePreview(file, type, file.isDown)
         } else {
-            startImagePreview(file, file.isDown)
+            null
         }
+
+        startImagePreview(file, file.isDown, type)
     }
 
     fun previewFile(file: OCFile, setFabVisible: CompletionCallback?) {
@@ -2472,43 +2471,29 @@ class FileDisplayActivity :
         }
     }
 
-    fun startImagePreview(file: OCFile, showPreview: Boolean) {
-        val showDetailsIntent = Intent(this, PreviewImageActivity::class.java)
-        showDetailsIntent.putExtra(EXTRA_FILE, file)
-        showDetailsIntent.putExtra(EXTRA_LIVE_PHOTO_FILE, file.livePhotoVideo)
-        showDetailsIntent.putExtra(
-            EXTRA_USER,
-            user.orElseThrow(Supplier { RuntimeException() })
-        )
-        if (showPreview) {
-            startActivity(showDetailsIntent)
-        } else {
-            val fileOperationsHelper =
-                FileOperationsHelper(this, userAccountManager, connectivityService, editorUtils)
-            fileOperationsHelper.startSyncForFileAndIntent(file, showDetailsIntent)
+    fun startImagePreview(file: OCFile, showPreview: Boolean, type: VirtualFolderType? = null) {
+        if (user.isEmpty) {
+            Log_OC.e(TAG, "cannot start image preview")
+            return
         }
-    }
 
-    fun startImagePreview(file: OCFile, type: VirtualFolderType?, showPreview: Boolean) {
-        val showDetailsIntent = Intent(this, PreviewImageActivity::class.java)
-        showDetailsIntent.putExtra(EXTRA_FILE, file)
-        showDetailsIntent.putExtra(EXTRA_LIVE_PHOTO_FILE, file.livePhotoVideo)
-        showDetailsIntent.putExtra(
-            EXTRA_USER,
-            user.orElseThrow(Supplier { RuntimeException() })
-        )
-        showDetailsIntent.putExtra(PreviewImageActivity.EXTRA_VIRTUAL_TYPE, type)
+        val intent = Intent(this, PreviewImageActivity::class.java).apply {
+            putExtra(EXTRA_FILE, file)
+            putExtra(EXTRA_LIVE_PHOTO_FILE, file.livePhotoVideo)
+            putExtra(EXTRA_USER, user.get())
+            type?.let { putExtra(PreviewImageActivity.EXTRA_VIRTUAL_TYPE, it) }
+        }
 
         if (showPreview) {
-            startActivity(showDetailsIntent)
+            startActivity(intent)
         } else {
-            val fileOperationsHelper = FileOperationsHelper(
+            val helper = FileOperationsHelper(
                 this,
                 userAccountManager,
                 connectivityService,
                 editorUtils
             )
-            fileOperationsHelper.startSyncForFileAndIntent(file, showDetailsIntent)
+            helper.startSyncForFileAndIntent(file, intent)
         }
     }
 
@@ -2772,8 +2757,8 @@ class FileDisplayActivity :
             val virtualType = bundle.get(PreviewImageActivity.EXTRA_VIRTUAL_TYPE) as VirtualFolderType?
             startImagePreview(
                 file,
-                virtualType,
-                true
+                true,
+                virtualType
             )
         } else {
             startImagePreview(file, true)

app/src/main/java/com/owncloud/android/ui/events/SearchEvent.kt

@@ -33,6 +33,8 @@ data class SearchEvent(val searchQuery: String, val searchType: SearchRemoteOper
         SearchRemoteOperation.SearchType.FAVORITE_SEARCH -> SearchType.FAVORITE_SEARCH
         SearchRemoteOperation.SearchType.RECENTLY_MODIFIED_SEARCH -> SearchType.RECENTLY_MODIFIED_SEARCH
         SearchRemoteOperation.SearchType.SHARED_FILTER -> SearchType.SHARED_FILTER
+        SearchRemoteOperation.SearchType.PHOTO_SEARCH -> SearchType.GALLERY_SEARCH
+        SearchRemoteOperation.SearchType.GALLERY_SEARCH -> SearchType.GALLERY_SEARCH
         else -> null
     }
 

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

@@ -166,13 +166,8 @@ class PreviewImageActivity :
                 preferences
             )
         } else {
-            // get parent from path
-            var parentFolder = file?.let { storageManager.getFileById(it.parentId) }
-
-            if (parentFolder == null) {
-                // should not be necessary
-                parentFolder = storageManager.getFileByEncryptedRemotePath(OCFile.ROOT_PATH)
-            }
+            val parentFolder = file?.let { storageManager.getFileById(it.parentId) }
+                ?: storageManager.getFileByEncryptedRemotePath(OCFile.ROOT_PATH)
 
             previewImagePagerAdapter = PreviewImagePagerAdapter(
                 this,