Skip to content

Commit 65fc39f

Browse files
tobiasKaminskybackportbot[bot]
authored andcommitted
keep slideshow when deleting file
Signed-off-by: tobiasKaminsky <[email protected]>
1 parent ce1317d commit 65fc39f

File tree

2 files changed

+0
-11
lines changed

2 files changed

+0
-11
lines changed

Diff for: app/src/main/java/com/owncloud/android/ui/dialog/RemoveFilesDialogFragment.kt

-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import com.owncloud.android.datamodel.OCFile
2424
import com.owncloud.android.ui.activity.FileActivity
2525
import com.owncloud.android.ui.activity.FileDisplayActivity
2626
import com.owncloud.android.ui.dialog.ConfirmationDialogFragment.ConfirmationDialogFragmentListener
27-
import com.owncloud.android.ui.preview.PreviewImageActivity
2827
import javax.inject.Inject
2928

3029
/**
@@ -98,7 +97,6 @@ class RemoveFilesDialogFragment : ConfirmationDialogFragment(), ConfirmationDial
9897
fileActivity?.connectivityService?.isNetworkAndServerAvailable { result ->
9998
if (result) {
10099
if (files.isNotEmpty()) {
101-
getTypedActivity(PreviewImageActivity::class.java)?.showDirectoryWhenDeletionCompleted()
102100
fileActivity.fileOperationsHelper?.removeFiles(files, onlyLocalCopy, false)
103101
}
104102

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

-9
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ class PreviewImageActivity : FileActivity(), FileFragment.ContainerActivity, OnR
8383
lateinit var localBroadcastManager: LocalBroadcastManager
8484

8585
private var actionBar: ActionBar? = null
86-
private var showDirectoryWhenDeletionCompleted = false
8786

8887
override fun onCreate(savedInstanceState: Bundle?) {
8988
super.onCreate(savedInstanceState)
@@ -124,10 +123,6 @@ class PreviewImageActivity : FileActivity(), FileFragment.ContainerActivity, OnR
124123
observeWorkerState()
125124
}
126125

127-
fun showDirectoryWhenDeletionCompleted() {
128-
showDirectoryWhenDeletionCompleted = true
129-
}
130-
131126
fun toggleActionBarVisibility(hide: Boolean) {
132127
if (actionBar == null) {
133128
return
@@ -284,10 +279,6 @@ class PreviewImageActivity : FileActivity(), FileFragment.ContainerActivity, OnR
284279

285280
viewPager?.setCurrentItem(nextPosition, true)
286281
previewImagePagerAdapter?.delete(deletePosition)
287-
288-
if (showDirectoryWhenDeletionCompleted) {
289-
backToDisplayActivity()
290-
}
291282
} else if (operation is SynchronizeFileOperation) {
292283
onSynchronizeFileOperationFinish(result)
293284
}

0 commit comments

Comments
 (0)