Merge pull request #14782 from nextcloud/finish-preview-image-activity-after-delete-image

alperozturk96 · web-flow · commit d77f207fed52 · 2025-04-23T10:08:22.000+02:00
Finish PreviewImageActivity After Image Deletion
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
@@ -24,6 +24,7 @@ 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
 
 /**
@@ -116,11 +117,14 @@ class RemoveFilesDialogFragment : ConfirmationDialogFragment(), ConfirmationDial
             }
 
             finishActionMode()
+            finishPreviewImageActivity()
         }
     }
 
     override fun onNeutral(callerTag: String?) = Unit
 
+    private fun finishPreviewImageActivity() = getTypedActivity(PreviewImageActivity::class.java)?.finish()
+
     private fun setActionMode(actionMode: ActionMode?) {
         this.actionMode = actionMode
     }

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ import com.owncloud.android.datamodel.OCFile`
`24`	`24`	`import com.owncloud.android.ui.activity.FileActivity`
`25`	`25`	`import com.owncloud.android.ui.activity.FileDisplayActivity`
`26`	`26`	`import com.owncloud.android.ui.dialog.ConfirmationDialogFragment.ConfirmationDialogFragmentListener`
	`27`	`+import com.owncloud.android.ui.preview.PreviewImageActivity`
`27`	`28`	`import javax.inject.Inject`
`28`	`29`
`29`	`30`	`/**`
`@@ -116,11 +117,14 @@ class RemoveFilesDialogFragment : ConfirmationDialogFragment(), ConfirmationDial`
`116`	`117`	`}`
`117`	`118`
`118`	`119`	`finishActionMode()`
	`120`	`+ finishPreviewImageActivity()`
`119`	`121`	`}`
`120`	`122`	`}`
`121`	`123`
`122`	`124`	`override fun onNeutral(callerTag: String?) = Unit`
`123`	`125`
	`126`	`+ private fun finishPreviewImageActivity() = getTypedActivity(PreviewImageActivity::class.java)?.finish()`
	`127`	`+`
`124`	`128`	`private fun setActionMode(actionMode: ActionMode?) {`
`125`	`129`	`this.actionMode = actionMode`
`126`	`130`	`}`