From 74ae747c94a1cd9faad39f9676a6f33aba7537c1 Mon Sep 17 00:00:00 2001 From: seven332 Date: Sun, 13 Mar 2016 13:13:41 +0800 Subject: [PATCH] Do not show select download label dialog for no custom labels --- .../main/java/com/hippo/ehviewer/ui/CommonOperations.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/src/main/java/com/hippo/ehviewer/ui/CommonOperations.java b/app/src/main/java/com/hippo/ehviewer/ui/CommonOperations.java index b2a0dbd0b..6ebdec42e 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/CommonOperations.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/CommonOperations.java @@ -221,10 +221,16 @@ public final class CommonOperations { boolean justStart = dm.containDownloadInfo(galleryInfo.gid); String label = null; + // Get default download label if (!justStart && Settings.getHasDefaultDownloadLabel()) { label = Settings.getDefaultDownloadLabel(); justStart = label == null || dm.containLabel(label); } + // If there is no other label, just use null label + if (!justStart && 0 == dm.getLabelList().size()) { + justStart = true; + label = null; + } if (justStart) { // Already in download list or get default label