Merge branch 'develop' into modern-notification-2

ultrasonic/src/main/java/org/moire/ultrasonic/service/Downloader.java

@@ -194,6 +194,12 @@ public class Downloader
                     revision++;
                     i--;
                 }
+                else if (downloadFile.isFailed() && !downloadFile.shouldRetry()) {
+                    // Don't continue to attempt to download forever
+                    backgroundDownloadList.remove(i);
+                    revision++;
+                    i--;
+                }
                 else
                 {
                     currentDownloading = downloadFile;

ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/DownloadFile.kt

@@ -45,6 +45,7 @@ class DownloadFile(
     private val mediaStoreService: MediaStoreService
     private var downloadTask: CancellableTask? = null
     var isFailed = false
+    private var retryCount = 5
 
     private val desiredBitRate: Int = Util.getMaxBitRate(context)
 
@@ -127,6 +128,10 @@ class DownloadFile(
         return save
     }
 
+    fun shouldRetry(): Boolean {
+        return (retryCount > 0)
+    }
+
     fun delete() {
         cancelDownload()
         Util.delete(partialFile)
@@ -288,6 +293,9 @@ class DownloadFile(
                 Util.delete(saveFile)
                 if (!isCancelled) {
                     isFailed = true
+                    if (retryCount > 0) {
+                        --retryCount
+                    }
                     Timber.w(x, "Failed to download '%s'.", song)
                 }
             } finally {