Skip to content

Commit da517d1

Browse files
committed
fix(slideshow): After file deletion, properly refresh view pager
Otherwise, the localOnly file deletion will not update the UI. Signed-off-by: Philipp Hasper <vcs@hasper.info>
1 parent 0eaf890 commit da517d1

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ 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
2728
import javax.inject.Inject
2829

2930
/**
@@ -96,6 +97,7 @@ class RemoveFilesDialogFragment :
9697

9798
val fileActivity = getTypedActivity(FileActivity::class.java)
9899
val fda = getTypedActivity(FileDisplayActivity::class.java)
100+
val pia = getTypedActivity(PreviewImageActivity::class.java)
99101
fileActivity?.connectivityService?.isNetworkAndServerAvailable { result ->
100102
if (result) {
101103
fileActivity.showLoadingDialog(fileActivity.getString(R.string.wait_a_moment))
@@ -110,6 +112,7 @@ class RemoveFilesDialogFragment :
110112

111113
if (offlineFiles.isNotEmpty()) {
112114
fda?.refreshCurrentDirectory()
115+
pia?.initViewPager()
113116
}
114117

115118
fileActivity.dismissLoadingDialog()
@@ -123,6 +126,7 @@ class RemoveFilesDialogFragment :
123126
}
124127

125128
fda?.refreshCurrentDirectory()
129+
pia?.initViewPager()
126130
}
127131

128132
finishActionMode()

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,13 @@ class PreviewImageActivity :
211211
}
212212
}
213213

214-
private fun updateViewPagerAfterDeletionAndAdvanceForward() {
214+
fun initViewPager() {
215+
if (user.isPresent) {
216+
initViewPager(user.get())
217+
}
218+
}
219+
220+
fun updateViewPagerAfterDeletionAndAdvanceForward() {
215221
val deletePosition = viewPager?.currentItem ?: return
216222
previewImagePagerAdapter?.let { adapter ->
217223
val nextPosition = min(deletePosition, adapter.itemCount - 1)

0 commit comments

Comments
 (0)