From c5b38ef53b17f47aecce4e39124fe0394524614c Mon Sep 17 00:00:00 2001
From: X1nto <burtkni@yandex.ru>
Date: Mon, 29 Jun 2020 23:31:18 +0400
Subject: [PATCH] added OnCancelListener

---
 .../core/downloader/MicrogDownloadService.kt       | 14 ++++----------
 .../core/downloader/VancedDownloadService.kt       |  9 ++++-----
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/com/vanced/manager/core/downloader/MicrogDownloadService.kt b/app/src/main/java/com/vanced/manager/core/downloader/MicrogDownloadService.kt
index e211cd23..7f6a0093 100644
--- a/app/src/main/java/com/vanced/manager/core/downloader/MicrogDownloadService.kt
+++ b/app/src/main/java/com/vanced/manager/core/downloader/MicrogDownloadService.kt
@@ -5,23 +5,14 @@ import android.content.Context
 import android.content.Intent
 import android.os.IBinder
 import android.widget.Toast
-import androidx.localbroadcastmanager.content.LocalBroadcastManager
 import com.dezlum.codelabs.getjson.GetJson
-import com.downloader.Error
-import com.downloader.OnDownloadListener
-import com.downloader.OnStartOrResumeListener
-import com.downloader.PRDownloader
+import com.downloader.*
 import com.vanced.manager.R
 import com.vanced.manager.core.installer.AppInstaller
-import com.vanced.manager.ui.fragments.HomeFragment
 import com.vanced.manager.utils.InternetTools.getFileNameFromUrl
 import com.vanced.manager.utils.NotificationHelper
 import com.vanced.manager.utils.NotificationHelper.cancelNotif
 import com.vanced.manager.utils.NotificationHelper.createBasicNotif
-import com.vanced.manager.utils.PackageHelper.installApp
-import java.lang.Exception
-import java.lang.IllegalStateException
-import java.lang.RuntimeException
 import java.util.concurrent.ExecutionException
 
 class MicrogDownloadService: Service() {
@@ -59,6 +50,9 @@ class MicrogDownloadService: Service() {
                     context = this
                 )
             }
+            .setOnCancelListener { OnCancelListener {
+                cancelNotif(channel, this)
+            } }
             .start(object : OnDownloadListener {
                 override fun onDownloadComplete() {
                     prefs?.edit()?.putBoolean("isMicrogDownloading", false)?.apply()
diff --git a/app/src/main/java/com/vanced/manager/core/downloader/VancedDownloadService.kt b/app/src/main/java/com/vanced/manager/core/downloader/VancedDownloadService.kt
index daf1a345..968f65aa 100644
--- a/app/src/main/java/com/vanced/manager/core/downloader/VancedDownloadService.kt
+++ b/app/src/main/java/com/vanced/manager/core/downloader/VancedDownloadService.kt
@@ -9,10 +9,7 @@ import android.widget.Toast
 import androidx.localbroadcastmanager.content.LocalBroadcastManager
 import androidx.preference.PreferenceManager
 import com.dezlum.codelabs.getjson.GetJson
-import com.downloader.Error
-import com.downloader.OnDownloadListener
-import com.downloader.OnStartOrResumeListener
-import com.downloader.PRDownloader
+import com.downloader.*
 import com.vanced.manager.R
 import com.vanced.manager.core.installer.RootSplitInstallerService
 import com.vanced.manager.core.installer.SplitInstaller
@@ -22,7 +19,6 @@ import com.vanced.manager.utils.InternetTools.getFileNameFromUrl
 import com.vanced.manager.utils.NotificationHelper.cancelNotif
 import com.vanced.manager.utils.NotificationHelper.createBasicNotif
 import com.vanced.manager.utils.NotificationHelper.displayDownloadNotif
-import java.lang.Exception
 import java.util.concurrent.ExecutionException
 
 class VancedDownloadService: Service() {
@@ -75,6 +71,9 @@ class VancedDownloadService: Service() {
                 val mProgress = progress.currentBytes * 100 / progress.totalBytes
                 displayDownloadNotif(channel, progress = mProgress.toInt(), filename = getFileNameFromUrl(url), downTag = "VancedDownload", context = this)
             }
+            .setOnCancelListener { OnCancelListener {
+                cancelNotif(channel, this)
+            } }
             .start(object : OnDownloadListener {
                 override fun onDownloadComplete() {
                     when (type) {