Merge remote-tracking branch 'upstream/master'

arvapps-forked-projects · Mar 15, 2024 · 30f7722 · 30f7722
2 parents a67a048 + a6dab69
commit 30f7722
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -33,7 +33,7 @@
 -keepnames class * extends java.lang.Exception
 # For Class.getEnumConstants()
 -keepclassmembers enum * {
-  public static **[] values();
+    public static **[] values();
 }
 -keepnames class me.zhanghai.android.files.** implements android.os.Parcelable
 

diff --git a/app/src/main/java/me/zhanghai/android/files/provider/common/FutureExtensions.kt b/app/src/main/java/me/zhanghai/android/files/provider/common/FutureExtensions.kt
@@ -15,9 +15,14 @@ import java.util.concurrent.Future
 import java.util.concurrent.TimeUnit
 import java.util.concurrent.TimeoutException
 
-inline fun <T, R> Future<T>.map(
-    crossinline transform: (T) -> R,
-    crossinline transformException: (Exception) -> Exception = { it }
+// The following causes a NoSuchFieldError during runtime, similar to
+// https://youtrack.jetbrains.com/issue/KT-20245/
+//inline fun <T, R> Future<T>.map(
+//    crossinline transform: (T) -> R,
+//    crossinline transformException: (Exception) -> Exception = { it }
+fun <T, R> Future<T>.map(
+    transform: (T) -> R,
+    transformException: (Exception) -> Exception = { it }
 ): Future<R> =
     object : Future<R> {
         override fun cancel(mayInterruptIfRunning: Boolean): Boolean =