diff --git a/bin/EhViewer.apk b/bin/EhViewer.apk index c32488f7e..aef7852f0 100644 Binary files a/bin/EhViewer.apk and b/bin/EhViewer.apk differ diff --git a/bin/classes.dex b/bin/classes.dex index 09aae27fd..a6a647410 100644 Binary files a/bin/classes.dex and b/bin/classes.dex differ diff --git a/bin/res/crunch/drawable-xxhdpi/spinner_16_inner.png b/bin/res/crunch/drawable-xxhdpi/spinner_16_inner.png index 751e3e383..e898ad8b4 100644 Binary files a/bin/res/crunch/drawable-xxhdpi/spinner_16_inner.png and b/bin/res/crunch/drawable-xxhdpi/spinner_16_inner.png differ diff --git a/bin/res/crunch/drawable-xxhdpi/spinner_16_outer.png b/bin/res/crunch/drawable-xxhdpi/spinner_16_outer.png index 0e999cfda..2b5740a3a 100644 Binary files a/bin/res/crunch/drawable-xxhdpi/spinner_16_outer.png and b/bin/res/crunch/drawable-xxhdpi/spinner_16_outer.png differ diff --git a/bin/res/crunch/drawable-xxhdpi/spinner_76_inner.png b/bin/res/crunch/drawable-xxhdpi/spinner_76_inner.png index 14f2e45fd..4329e09cc 100644 Binary files a/bin/res/crunch/drawable-xxhdpi/spinner_76_inner.png and b/bin/res/crunch/drawable-xxhdpi/spinner_76_inner.png differ diff --git a/bin/res/crunch/drawable-xxhdpi/spinner_76_outer.png b/bin/res/crunch/drawable-xxhdpi/spinner_76_outer.png index 6ae4cf7a0..afcdaa977 100644 Binary files a/bin/res/crunch/drawable-xxhdpi/spinner_76_outer.png and b/bin/res/crunch/drawable-xxhdpi/spinner_76_outer.png differ diff --git a/bin/resources.ap_ b/bin/resources.ap_ index 525a2a2a1..7356371c3 100644 Binary files a/bin/resources.ap_ and b/bin/resources.ap_ differ diff --git a/res/drawable-xxhdpi/spinner_16_inner.png b/res/drawable-xxhdpi/spinner_16_inner.png index ab16a46d3..73f34e3a6 100644 Binary files a/res/drawable-xxhdpi/spinner_16_inner.png and b/res/drawable-xxhdpi/spinner_16_inner.png differ diff --git a/res/drawable-xxhdpi/spinner_16_outer.png b/res/drawable-xxhdpi/spinner_16_outer.png index fcf8c17ad..6d30f7cc3 100644 Binary files a/res/drawable-xxhdpi/spinner_16_outer.png and b/res/drawable-xxhdpi/spinner_16_outer.png differ diff --git a/res/drawable-xxhdpi/spinner_76_inner.png b/res/drawable-xxhdpi/spinner_76_inner.png index db30ca907..d01402da6 100644 Binary files a/res/drawable-xxhdpi/spinner_76_inner.png and b/res/drawable-xxhdpi/spinner_76_inner.png differ diff --git a/res/drawable-xxhdpi/spinner_76_outer.png b/res/drawable-xxhdpi/spinner_76_outer.png index 3821b9543..b16b8a242 100644 Binary files a/res/drawable-xxhdpi/spinner_76_outer.png and b/res/drawable-xxhdpi/spinner_76_outer.png differ diff --git a/src/com/hippo/ehviewer/service/DownloadService.java b/src/com/hippo/ehviewer/service/DownloadService.java index 9460a93db..da7e38859 100644 --- a/src/com/hippo/ehviewer/service/DownloadService.java +++ b/src/com/hippo/ehviewer/service/DownloadService.java @@ -63,21 +63,31 @@ public class DownloadService extends Service { @Override public void onDownloadMangaStart(String id) { - mBuilder.setContentTitle(getString(R.string.downloading) - + " " + Download.get(id).title) + DownloadInfo di = Download.get(id); + if (di == null) + mNotifyManager.cancel(DOWNLOAD_NOTIFY_ID); + else { + mBuilder.setContentTitle(getString(R.string.downloading) + + " " + di.title) .setContentText(null) .setProgress(0, 0, true).setOngoing(true).setAutoCancel(false);; mNotifyManager.notify(DOWNLOAD_NOTIFY_ID, mBuilder.build()); + } } @Override public void onDownloadMangaStart(String id, int pageSum, int startIndex) { - mBuilder.setContentTitle(getString(R.string.downloading) - + " " + Download.get(id).title) - .setContentText(startIndex + " / " + pageSum) - .setProgress(pageSum, startIndex, false).setOngoing(true) - .setAutoCancel(false); - mNotifyManager.notify(DOWNLOAD_NOTIFY_ID, mBuilder.build()); + DownloadInfo di = Download.get(id); + if (di == null) + mNotifyManager.cancel(DOWNLOAD_NOTIFY_ID); + else { + mBuilder.setContentTitle(getString(R.string.downloading) + + " " + di.title) + .setContentText(startIndex + " / " + pageSum) + .setProgress(pageSum, startIndex, false).setOngoing(true) + .setAutoCancel(false); + mNotifyManager.notify(DOWNLOAD_NOTIFY_ID, mBuilder.build()); + } } @Override