From bf250e6cc6746d3c1bf69abe0ded804792a1d01c Mon Sep 17 00:00:00 2001 From: Maxr1998 Date: Mon, 24 May 2021 13:56:39 +0200 Subject: [PATCH 1/2] Update Kotlin to 1.5.10 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index fde5f95b..9ec4c71c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -19,6 +19,6 @@ android.enableJetifier=true # Kotlin code style for this project: "official" or "obsolete": kotlin.code.style=official # Kotlin version for this project -kotlinVersion=1.5.0 +kotlinVersion=1.5.10 # Use snapshot release of Jellyfin SDK useSdkSnapshot=false From 0e72e5c6b8f425901b0bb5d7fc68d82329a63184 Mon Sep 17 00:00:00 2001 From: Maxr1998 Date: Mon, 24 May 2021 13:59:05 +0200 Subject: [PATCH 2/2] Revert "Workaround for coroutines crash" This reverts commit fb41aeb8. The underlying bug was fixed in Kotlin 1.5.10, thus this workaround isn't necessary anymore. --- .../jellyfin/mobile/player/source/Result.kt | 26 ------------------- 1 file changed, 26 deletions(-) delete mode 100644 app/src/main/java/org/jellyfin/mobile/player/source/Result.kt diff --git a/app/src/main/java/org/jellyfin/mobile/player/source/Result.kt b/app/src/main/java/org/jellyfin/mobile/player/source/Result.kt deleted file mode 100644 index 63c38714..00000000 --- a/app/src/main/java/org/jellyfin/mobile/player/source/Result.kt +++ /dev/null @@ -1,26 +0,0 @@ -package org.jellyfin.mobile.player.source - -class Result private constructor( - val value: T?, - val error: Throwable?, -) { - @Suppress("NOTHING_TO_INLINE") - inline fun getOrNull(): T? = value - - @Suppress("UNCHECKED_CAST") - inline fun onSuccess(action: (T) -> Unit): Result { - if (error == null) action(value as T) - return this - } - - inline fun onFailure(action: (Throwable) -> Unit): Result { - if (error != null) action(error) - return this - } - - companion object { - fun success(value: T) = Result(value, null) - - fun failure(error: Throwable) = Result(null, error) - } -}