From b52f260c9e7cf2b2de86081fb9b2ea3925163443 Mon Sep 17 00:00:00 2001 From: seven332 Date: Mon, 30 May 2016 00:20:04 +0800 Subject: [PATCH] Avoid restore download null --- .../hippo/ehviewer/preference/RestoreDownloadPreference.java | 3 +++ app/src/main/java/com/hippo/ehviewer/spider/SpiderInfo.java | 1 + 2 files changed, 4 insertions(+) diff --git a/app/src/main/java/com/hippo/ehviewer/preference/RestoreDownloadPreference.java b/app/src/main/java/com/hippo/ehviewer/preference/RestoreDownloadPreference.java index 4d2476e7f..be5879127 100644 --- a/app/src/main/java/com/hippo/ehviewer/preference/RestoreDownloadPreference.java +++ b/app/src/main/java/com/hippo/ehviewer/preference/RestoreDownloadPreference.java @@ -90,6 +90,9 @@ public class RestoreDownloadPreference extends TaskPreference { try { is = siFile.openInputStream(); SpiderInfo spiderInfo = SpiderInfo.read(is); + if (spiderInfo == null) { + return null; + } long gid = spiderInfo.gid; if (mManager.containDownloadInfo(gid)) { return null; diff --git a/app/src/main/java/com/hippo/ehviewer/spider/SpiderInfo.java b/app/src/main/java/com/hippo/ehviewer/spider/SpiderInfo.java index 25f1b307a..98747bb8c 100644 --- a/app/src/main/java/com/hippo/ehviewer/spider/SpiderInfo.java +++ b/app/src/main/java/com/hippo/ehviewer/spider/SpiderInfo.java @@ -94,6 +94,7 @@ public class SpiderInfo { } } + @Nullable @SuppressWarnings("InfiniteLoopStatement") public static SpiderInfo read(@Nullable InputStream is) { if (null == is) {