Skip to content

[stable-3.31] showDirectoryWhenDeletionCompleted set to false? #14706

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tobiasKaminsky merged 1 commit into from
Mar 19, 2025
Merged

[stable-3.31] showDirectoryWhenDeletionCompleted set to false? #14706

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions app/src/main/java/com/owncloud/android/ui/dialog/RemoveFilesDialogFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

/**
Expand Down Expand Up @@ -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)
}

Expand Down
9 changes: 0 additions & 9 deletions app/src/main/java/com/owncloud/android/ui/preview/PreviewImageActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -124,10 +123,6 @@ class PreviewImageActivity : FileActivity(), FileFragment.ContainerActivity, OnR
observeWorkerState()
}

fun showDirectoryWhenDeletionCompleted() {
showDirectoryWhenDeletionCompleted = true
}

fun toggleActionBarVisibility(hide: Boolean) {
if (actionBar == null) {
return
Expand Down Expand Up @@ -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)
}
Expand Down
Loading