From d0d9be0336f51946733304a8006dc4d0166c9c73 Mon Sep 17 00:00:00 2001
From: NekoInverter <42698724+NekoInverter@users.noreply.github.com>
Date: Tue, 5 May 2020 14:55:34 +0800
Subject: [PATCH] Fix stop all download on 509

---
 .../com/hippo/ehviewer/download/DownloadManager.java |  1 -
 .../com/hippo/ehviewer/download/DownloadService.java | 12 +++++-------
 build.gradle                                         |  2 +-
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/hippo/ehviewer/download/DownloadManager.java b/app/src/main/java/com/hippo/ehviewer/download/DownloadManager.java
index 2905fc6ba..4e0c19473 100644
--- a/app/src/main/java/com/hippo/ehviewer/download/DownloadManager.java
+++ b/app/src/main/java/com/hippo/ehviewer/download/DownloadManager.java
@@ -848,7 +848,6 @@ public class DownloadManager implements SpiderQueen.OnSpiderListener {
 
     @Override
     public void onGet509(int index) {
-        stopAllDownload();
         NotifyTask task = mNotifyTaskPool.pop();
         if (task == null) {
             task = new NotifyTask();
diff --git a/app/src/main/java/com/hippo/ehviewer/download/DownloadService.java b/app/src/main/java/com/hippo/ehviewer/download/DownloadService.java
index 95eeab091..c4a92cd99 100644
--- a/app/src/main/java/com/hippo/ehviewer/download/DownloadService.java
+++ b/app/src/main/java/com/hippo/ehviewer/download/DownloadService.java
@@ -22,7 +22,6 @@ import android.app.PendingIntent;
 import android.app.Service;
 import android.content.Context;
 import android.content.Intent;
-import android.graphics.BitmapFactory;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.IBinder;
@@ -245,13 +244,11 @@ public class DownloadService extends Service implements DownloadManager.Download
 
         mDownloadedBuilder = new NotificationCompat.Builder(getApplicationContext(), CHANNEL_ID)
                 .setSmallIcon(android.R.drawable.stat_sys_download_done)
-                .setLargeIcon(BitmapFactory.decodeResource(getResources(), R.mipmap.ic_launcher))
                 .setContentTitle(getString(R.string.stat_download_done_title))
                 .setDeleteIntent(piClear)
                 .setOngoing(false)
                 .setAutoCancel(true)
-                .setContentIntent(piActivity)
-                .setChannelId(CHANNEL_ID);
+                .setContentIntent(piActivity);
 
         mDownloadedDelay = new NotificationDelay(this, mNotifyManager, mDownloadedBuilder, ID_DOWNLOADED);
     }
@@ -263,19 +260,20 @@ public class DownloadService extends Service implements DownloadManager.Download
 
         m509dBuilder = new NotificationCompat.Builder(getApplicationContext(), CHANNEL_ID)
                 .setSmallIcon(R.drawable.ic_stat_alert)
-                .setLargeIcon(BitmapFactory.decodeResource(getResources(), R.mipmap.ic_launcher))
                 .setContentText(getString(R.string.stat_509_alert_title))
                 .setContentText(getString(R.string.stat_509_alert_text))
                 .setAutoCancel(true)
                 .setOngoing(false)
-                .setCategory(NotificationCompat.CATEGORY_ERROR)
-                .setChannelId(CHANNEL_ID);
+                .setCategory(NotificationCompat.CATEGORY_ERROR);
 
         m509Delay = new NotificationDelay(this, mNotifyManager, m509dBuilder, ID_509);
     }
 
     @Override
     public void onGet509() {
+        if (mDownloadManager != null) {
+            mDownloadManager.stopAllDownload();
+        }
         if (mNotifyManager == null) {
             return;
         }
diff --git a/build.gradle b/build.gradle
index 390899f11..3e59f4746 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         maven { url "https://jitpack.io" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.0-beta03'
+        classpath 'com.android.tools.build:gradle:4.0.0-beta05'
         classpath 'com.google.android.gms:oss-licenses-plugin:0.10.2'
 
         // NOTE: Do not place your application dependencies here; they belong