fix: npe when loading patch bundle on android 8

ReVanced · Sep 22, 2023 · 0bfa776 · 0bfa776
1 parent d2b0993
commit 0bfa776
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/android/app/src/main/kotlin/app/revanced/manager/flutter/MainActivity.kt b/android/app/src/main/kotlin/app/revanced/manager/flutter/MainActivity.kt
@@ -94,9 +94,12 @@ class MainActivity : FlutterActivity() {
 
                 "getPatches" -> {
                     val patchBundleFilePath = call.argument<String>("patchBundleFilePath")
+                    val cacheDirPath = call.argument<String>("cacheDirPath")
+
                     if (patchBundleFilePath != null) {
                         val patches = PatchBundleLoader.Dex(
-                            File(patchBundleFilePath)
+                            File(patchBundleFilePath),
+                            optimizedDexDirectory = File(cacheDirPath)
                         ).map { patch ->
                             val map = HashMap<String, Any>()
                             map["\"name\""] = "\"${patch.patchName.replace("\"","\\\"")}\""

diff --git a/lib/services/manager_api.dart b/lib/services/manager_api.dart
@@ -306,12 +306,20 @@ class ManagerAPI {
       return patches;
     }
     final File? patchBundleFile = await downloadPatches();
+    final Directory appCache = await getTemporaryDirectory();
+    Directory('${appCache.path}/cache').createSync();
+    final Directory workDir =
+    Directory('${appCache.path}/cache').createTempSync('tmp-');
+    final Directory cacheDir = Directory('${workDir.path}/cache');
+    cacheDir.createSync();
+
     if (patchBundleFile != null) {
       try {
         final patchesObject = await PatcherAPI.patcherChannel.invokeMethod(
           'getPatches',
           {
             'patchBundleFilePath': patchBundleFile.path,
+            'cacheDirPath': cacheDir.path,
           },
         );
         final List<Map<String, dynamic>> patchesMap = [];