From 65fc39f97a8932039944e591e16b80113486e15e Mon Sep 17 00:00:00 2001 From: tobiasKaminsky Date: Fri, 7 Mar 2025 09:48:26 +0100 Subject: [PATCH] keep slideshow when deleting file Signed-off-by: tobiasKaminsky --- .../android/ui/dialog/RemoveFilesDialogFragment.kt | 2 -- .../owncloud/android/ui/preview/PreviewImageActivity.kt | 9 --------- 2 files changed, 11 deletions(-) diff --git a/app/src/main/java/com/owncloud/android/ui/dialog/RemoveFilesDialogFragment.kt b/app/src/main/java/com/owncloud/android/ui/dialog/RemoveFilesDialogFragment.kt index 1d8c3f62840d..4b66ebf955c9 100644 --- a/app/src/main/java/com/owncloud/android/ui/dialog/RemoveFilesDialogFragment.kt +++ b/app/src/main/java/com/owncloud/android/ui/dialog/RemoveFilesDialogFragment.kt @@ -24,7 +24,6 @@ import com.owncloud.android.datamodel.OCFile import com.owncloud.android.ui.activity.FileActivity import com.owncloud.android.ui.activity.FileDisplayActivity import com.owncloud.android.ui.dialog.ConfirmationDialogFragment.ConfirmationDialogFragmentListener -import com.owncloud.android.ui.preview.PreviewImageActivity import javax.inject.Inject /** @@ -98,7 +97,6 @@ class RemoveFilesDialogFragment : ConfirmationDialogFragment(), ConfirmationDial fileActivity?.connectivityService?.isNetworkAndServerAvailable { result -> if (result) { if (files.isNotEmpty()) { - getTypedActivity(PreviewImageActivity::class.java)?.showDirectoryWhenDeletionCompleted() fileActivity.fileOperationsHelper?.removeFiles(files, onlyLocalCopy, false) } diff --git a/app/src/main/java/com/owncloud/android/ui/preview/PreviewImageActivity.kt b/app/src/main/java/com/owncloud/android/ui/preview/PreviewImageActivity.kt index 86d3b4e04f92..c2580868bc35 100644 --- a/app/src/main/java/com/owncloud/android/ui/preview/PreviewImageActivity.kt +++ b/app/src/main/java/com/owncloud/android/ui/preview/PreviewImageActivity.kt @@ -83,7 +83,6 @@ class PreviewImageActivity : FileActivity(), FileFragment.ContainerActivity, OnR lateinit var localBroadcastManager: LocalBroadcastManager private var actionBar: ActionBar? = null - private var showDirectoryWhenDeletionCompleted = false override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) @@ -124,10 +123,6 @@ class PreviewImageActivity : FileActivity(), FileFragment.ContainerActivity, OnR observeWorkerState() } - fun showDirectoryWhenDeletionCompleted() { - showDirectoryWhenDeletionCompleted = true - } - fun toggleActionBarVisibility(hide: Boolean) { if (actionBar == null) { return @@ -284,10 +279,6 @@ class PreviewImageActivity : FileActivity(), FileFragment.ContainerActivity, OnR viewPager?.setCurrentItem(nextPosition, true) previewImagePagerAdapter?.delete(deletePosition) - - if (showDirectoryWhenDeletionCompleted) { - backToDisplayActivity() - } } else if (operation is SynchronizeFileOperation) { onSynchronizeFileOperationFinish(result) }