diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java
index 055311a16..5458fed21 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java
@@ -1061,33 +1061,12 @@ public final class GalleryListScene extends BaseScene
return true;
}
- boolean download;
- switch (mDownloadManager.getDownloadState(gi.gid)) {
- default:
- case DownloadInfo.STATE_INVALID:
- download = true;
- break;
- case DownloadInfo.STATE_NONE:
- download = true;
- break;
- case DownloadInfo.STATE_WAIT:
- download = false;
- break;
- case DownloadInfo.STATE_DOWNLOAD:
- download = false;
- break;
- case DownloadInfo.STATE_FINISH:
- download = true;
- break;
- case DownloadInfo.STATE_FAILED:
- download = true;
- break;
- }
+ boolean downloaded = mDownloadManager.getDownloadState(gi.gid) != DownloadInfo.STATE_INVALID;
boolean favourite = gi.favoriteSlot == -2;
CharSequence[] items = new CharSequence[] {
context.getString(R.string.read),
- context.getString(download ? R.string.download : R.string.stop_downloading),
+ context.getString(downloaded ? R.string.delete_downloads : R.string.download),
context.getString(favourite ? R.string.add_to_favourites : R.string.remove_from_favourites),
};
@@ -1102,10 +1081,10 @@ public final class GalleryListScene extends BaseScene
startActivity(intent);
break;
case 1: // Download
- if (download) {
- CommonOperations.startDownload(activity, gi, false);
+ if (downloaded) {
+ mDownloadManager.deleteDownload(gi.gid);
} else {
- mDownloadManager.stopDownload(gi.gid);
+ CommonOperations.startDownload(activity, gi, false);
}
break;
case 2: // Favorites
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 53cca4265..2fe60d99a 100755
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -170,6 +170,7 @@
移除收藏
停止下载
+ 删除下载
快速搜索
点击“+”来添加快速搜索
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index 696e7a6a4..bce00dbdf 100755
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -170,6 +170,7 @@
移除收藏
停止下載
+ 刪除下載
快速搜索
點擊“+”來添加快速搜索
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index f0f30a5dd..46e1405c2 100755
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -170,6 +170,7 @@
移除收藏
停止下載
+ 刪除下載
快速搜尋
點擊“+”以新增快速搜尋
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index cc5e9d235..5a239c3af 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -214,6 +214,7 @@
Remove from favourites
Stop downloading
+ Delete downloads
Quick search
Tap \"+\" to add Quick Search