From 2f7e84e12601787c8acae6746fcc0f2c3ac7241e Mon Sep 17 00:00:00 2001 From: FooIbar <118464521+FooIbar@users.noreply.github.com> Date: Thu, 12 Jan 2023 17:13:26 +0800 Subject: [PATCH] Refresh the item as well if the confirmation dialog is canceled --- .../main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.kt | 6 +++++- .../java/com/hippo/ehviewer/ui/scene/GalleryListScene.kt | 4 +++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.kt index 3fd5fbc7f..1a997b508 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.kt @@ -833,9 +833,11 @@ class DownloadsScene : BaseToolbarScene(), DownloadInfoListener, OnClickFabListe 0 -> { mDownloadManager!!.allDownloadInfoList } + 1 -> { mDownloadManager!!.defaultDownloadInfoList } + else -> { mDownloadManager!!.getLabelDownloadInfoList(label) } @@ -1193,7 +1195,9 @@ class DownloadsScene : BaseToolbarScene(), DownloadInfoListener, OnClickFabListe mLabelAdapter!!.notifyItemRemoved(position) } } - }.setNegativeButton(android.R.string.cancel) { _, _ -> + }.setNegativeButton(android.R.string.cancel) { dialog, _ -> + dialog.cancel() + }.setOnCancelListener { mLabelAdapter!!.notifyItemChanged(position) }.show() } diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.kt index e9fe92ba9..eef684de6 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.kt @@ -1420,7 +1420,9 @@ class GalleryListScene : SearchBarScene(), OnDragHandlerListener, SearchLayout.H mAdapter.notifyItemRemoved(position) } } - }.setNegativeButton(android.R.string.cancel) { _, _ -> + }.setNegativeButton(android.R.string.cancel) { dialog, _ -> + dialog.cancel() + }.setOnCancelListener { mAdapter.notifyItemChanged(position) }.show() }