Prevent long-running requests to make the app crash when user is logging out.

app/src/main/java/com/github/apognu/otter/repositories/FavoritesRepository.kt

@@ -29,10 +29,10 @@ class FavoritesRepository(override val context: Context?) : Repository<Track, Tr
       track.downloaded = downloaded.contains(track.id)
 
       track.bestUpload()?.let { upload ->
-        val url = mustNormalizeUrl(upload.listen_url)
-
+        maybeNormalizeUrl(upload.listen_url)?.let { url ->
           track.cached = Otter.get().exoCache.isCached(url, 0, upload.duration * 1000L)
         }
+      }
 
       track
     }

app/src/main/java/com/github/apognu/otter/repositories/HttpUpstream.kt

@@ -65,6 +65,7 @@ class HttpUpstream<D : Any, R : FunkwhaleResponse<D>>(val behavior: Behavior, pr
   }
 
   suspend fun get(url: String): Result<R, FuelError> {
+    return try {
       val request = Fuel.get(mustNormalizeUrl(url)).apply {
         if (!Settings.isAnonymous()) {
           header("Authorization", "Bearer ${Settings.getAccessToken()}")
@@ -77,10 +78,14 @@ class HttpUpstream<D : Any, R : FunkwhaleResponse<D>>(val behavior: Behavior, pr
         return retryGet(url)
       }
 
-    return result
+      result
+    } catch (e: Exception) {
+      Result.error(FuelError.wrap(e))
+    }
   }
 
   private suspend fun retryGet(url: String): Result<R, FuelError> {
+    return try {
       return if (HTTP.refresh()) {
         val request = Fuel.get(mustNormalizeUrl(url)).apply {
           if (!Settings.isAnonymous()) {
@@ -92,5 +97,8 @@ class HttpUpstream<D : Any, R : FunkwhaleResponse<D>>(val behavior: Behavior, pr
       } else {
         Result.Failure(FuelError.wrap(RefreshError))
       }
+    } catch (e: Exception) {
+      Result.error(FuelError.wrap(e))
+    }
   }
 }

app/src/main/java/com/github/apognu/otter/utils/Util.kt

@@ -22,9 +22,13 @@ fun Any.log() {
 }
 
 fun maybeNormalizeUrl(rawUrl: String?): String? {
+  try {
     if (rawUrl == null || rawUrl.isEmpty()) return null
 
     return mustNormalizeUrl(rawUrl)
+  } catch (e: Exception) {
+    return null
+  }
 }
 
 fun mustNormalizeUrl(rawUrl: String): String {