chore: merge dev to main (#1300)

ReVanced · Sep 23, 2023 · e0e01ae · e0e01ae
2 parents d2b0993 + 0983ba8
commit e0e01ae
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 5 deletions.
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 = [];

diff --git a/lib/ui/views/app_selector/app_selector_view.dart b/lib/ui/views/app_selector/app_selector_view.dart
@@ -54,7 +54,7 @@ class _AppSelectorViewState extends State<AppSelectorView> {
                 onPressed: () => Navigator.of(context).pop(),
               ),
               bottom: PreferredSize(
-                preferredSize: const Size.fromHeight(64.0),
+                preferredSize: const Size.fromHeight(66.0),
                 child: Padding(
                   padding: const EdgeInsets.symmetric(
                     vertical: 8.0,

diff --git a/lib/ui/views/patches_selector/patches_selector_view.dart b/lib/ui/views/patches_selector/patches_selector_view.dart
@@ -81,7 +81,7 @@ class _PatchesSelectorViewState extends State<PatchesSelectorView> {
                   child: Container(
                     margin: const EdgeInsets.only(top: 12, bottom: 12),
                     padding:
-                        const EdgeInsets.symmetric(horizontal: 6, vertical: 6),
+                    const EdgeInsets.symmetric(horizontal: 6, vertical: 6),
                     decoration: BoxDecoration(
                       color: Theme.of(context)
                           .colorScheme
@@ -99,7 +99,7 @@ class _PatchesSelectorViewState extends State<PatchesSelectorView> {
                 ),
                 CustomPopupMenu(
                   onSelected: (value) =>
-                      {model.onMenuSelection(value, context)},
+                  {model.onMenuSelection(value, context)},
                   children: {
                     0: I18nText(
                       'patchesSelectorView.loadPatchesSelection',
@@ -114,7 +114,7 @@ class _PatchesSelectorViewState extends State<PatchesSelectorView> {
                 ),
               ],
               bottom: PreferredSize(
-                preferredSize: const Size.fromHeight(64.0),
+                preferredSize: const Size.fromHeight(66.0),
                 child: Padding(
                   padding: const EdgeInsets.symmetric(
                     vertical: 8.0,