Emergency fix for getting stuck in recovery mode

Author: airsquared

src/main/java/airsquared/blobsaver/app/natives/Libirecovery.java

@@ -19,10 +19,16 @@
 package airsquared.blobsaver.app.natives;
 
 import airsquared.blobsaver.app.natives.NativeUtils.CFunctionName;
+import com.sun.jna.FunctionMapper;
+import com.sun.jna.Library;
+import com.sun.jna.Native;
+import com.sun.jna.NativeLibrary;
 import com.sun.jna.Pointer;
 import com.sun.jna.Structure;
 import com.sun.jna.ptr.PointerByReference;
 
+import java.util.Map;
+
 /**
  * https://github.com/libimobiledevice/libirecovery/blob/master/src/libirecovery.c
  */
@@ -67,15 +73,19 @@ public static class irecv_device_info extends Structure {
 
 
     static {
-        try {
-            NativeUtils.register(Libimobiledevice.class, "irecovery");
-        } catch (UnsatisfiedLinkError e) {
-            try {
-                NativeUtils.register(Libimobiledevice.class, "irecovery-1.0");
-            } catch (UnsatisfiedLinkError e2) {
-                e.addSuppressed(e2);
-                throw e;
-            }
-        }
+//        try {
+//        NativeUtils.register(Libimobiledevice.class, "irecovery");
+//        } catch (UnsatisfiedLinkError e) {
+//            try {
+//                NativeUtils.register(Libimobiledevice.class, "irecovery-1.0");
+//            } catch (UnsatisfiedLinkError e2) {
+//                e.addSuppressed(e2);
+//                throw e;
+//            }
+//        }
+        Native.register(Libirecovery.class, NativeLibrary.getInstance("irecovery", Map.of(Library.OPTION_CLASSLOADER, Libirecovery.class.getClassLoader(),
+                Library.OPTION_FUNCTION_MAPPER, (FunctionMapper) (lib, method) ->
+                        method.isAnnotationPresent(CFunctionName.class) ?
+                                method.getAnnotation(CFunctionName.class).value() : method.getName())));
     }
 }

src/main/java/airsquared/blobsaver/app/natives/NativeUtils.java

@@ -32,17 +32,17 @@
 
 final class NativeUtils {
 
-    private static final Map<String, ?> libraryOptions = Map.of(Library.OPTION_CLASSLOADER, NativeUtils.class.getClassLoader(),
-            Library.OPTION_FUNCTION_MAPPER, (FunctionMapper) (lib, method) ->
-                    method.isAnnotationPresent(CFunctionName.class) ?
-                            method.getAnnotation(CFunctionName.class).value() : method.getName());
+//    private static final Map<String, ?> libraryOptions = ;
 
     /**
      * Same exact implementation as Native.register(Class, String), except it
      * also includes a function mapper for methods annotated with @CFunctionName
      */
     static void register(Class<?> cls, String libName) {
-        Native.register(cls, NativeLibrary.getInstance(libName, libraryOptions));
+        Native.register(cls, NativeLibrary.getInstance(libName, Map.of(Library.OPTION_CLASSLOADER, cls.getClassLoader(),
+                Library.OPTION_FUNCTION_MAPPER, (FunctionMapper) (lib, method) ->
+                        method.isAnnotationPresent(CFunctionName.class) ?
+                                method.getAnnotation(CFunctionName.class).value() : method.getName())));
     }
 
     @Documented