From cbe3992b01524984843dc0bc7b988edf3bebda24 Mon Sep 17 00:00:00 2001
From: Nite <shunite@gmail.com>
Date: Mon, 2 May 2022 20:46:01 +0200
Subject: [PATCH] Fixed Notification Ids to be different for Downloader and
 Player Fixed multiple start of periodic CheckDownloads

---
 .../playback/MediaNotificationProvider.kt     |  4 +++-
 .../moire/ultrasonic/service/Downloader.kt    | 19 +++++++++++++++----
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/playback/MediaNotificationProvider.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/playback/MediaNotificationProvider.kt
index 17d0b0eb..7bccd678 100644
--- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/playback/MediaNotificationProvider.kt
+++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/playback/MediaNotificationProvider.kt
@@ -144,13 +144,15 @@ internal class MediaNotificationProvider(context: Context) :
             NOTIFICATION_CHANNEL_NAME,
             NotificationManager.IMPORTANCE_LOW
         )
+        channel.setShowBadge(false)
+
         notificationManager.createNotificationChannel(channel)
     }
 
     companion object {
         private const val NOTIFICATION_CHANNEL_ID = "org.moire.ultrasonic"
         private const val NOTIFICATION_CHANNEL_NAME = "Ultrasonic background service"
-        private const val NOTIFICATION_ID = 3033
+        private const val NOTIFICATION_ID = 3032
         private fun getSmallIconResId(): Int {
             return R.drawable.ic_stat_ultrasonic
         }
diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/Downloader.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/Downloader.kt
index 7532c263..b1d4b1b7 100644
--- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/Downloader.kt
+++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/Downloader.kt
@@ -46,6 +46,7 @@ class Downloader(
 
     var started: Boolean = false
     var shouldStop: Boolean = false
+    var isPolling: Boolean = false
 
     private val downloadQueue = PriorityQueue<DownloadFile>()
     private val activelyDownloading = mutableListOf<DownloadFile>()
@@ -67,6 +68,7 @@ class Downloader(
     init {
         // Check downloads if the playlist changed
         rxBusSubscription += RxBus.playlistObservable.subscribe {
+            Timber.v("Playlist has changed, checking Downloads...")
             checkDownloads()
         }
     }
@@ -79,10 +81,14 @@ class Downloader(
             } catch (all: Exception) {
                 Timber.e(all, "checkDownloads() failed.")
             } finally {
-                if (!shouldStop) {
-                    Handler(Looper.getMainLooper()).postDelayed(this, CHECK_INTERVAL)
-                } else {
-                    shouldStop = false
+                if (!isPolling) {
+                    isPolling = true
+                    if (!shouldStop) {
+                        Handler(Looper.getMainLooper()).postDelayed(this, CHECK_INTERVAL)
+                    } else {
+                        shouldStop = false
+                        isPolling = false
+                    }
                 }
             }
         }
@@ -98,6 +104,7 @@ class Downloader(
 
     @Synchronized
     fun start() {
+        if (started) return
         started = true
 
         // Start our loop
@@ -110,6 +117,7 @@ class Downloader(
     }
 
     fun stop() {
+        if (!started) return
         started = false
         shouldStop = true
         wifiLock?.release()
@@ -210,6 +218,7 @@ class Downloader(
             file.isFailed = false
             file.downloadTask = DownloadTask(file)
             file.downloadTask!!.start()
+            Timber.v("startDownloadOnService started downloading file ${file.completeFile}")
         }
     }
 
@@ -313,6 +322,7 @@ class Downloader(
             }
         }
 
+        Timber.v("downloadBackground Checking Downloads")
         checkDownloads()
     }
 
@@ -490,6 +500,7 @@ class Downloader(
                 inputStream.safeClose()
                 outputStream.safeClose()
                 CacheCleaner().cleanSpace()
+                Timber.v("DownloadTask checking downloads")
                 checkDownloads()
             }
         }