feat: working resource patching

android/app/build.gradle

@@ -30,12 +30,12 @@ android {
     ndkVersion flutter.ndkVersion
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_11
     }
 
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '11'
     }
 
     sourceSets {
@@ -67,7 +67,7 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
     // ReVanced
-    implementation "app.revanced:revanced-patcher:3.3.1"
+    implementation "app.revanced:revanced-patcher:3.3.3"
 
     // Signing & aligning
     implementation("org.bouncycastle:bcpkix-jdk15on:1.70")

android/app/src/main/kotlin/app/revanced/manager/MainActivity.kt

@@ -16,7 +16,7 @@ import app.revanced.patcher.extensions.PatchExtensions.description
 import app.revanced.patcher.extensions.PatchExtensions.patchName
 import app.revanced.patcher.extensions.PatchExtensions.version
 import app.revanced.patcher.patch.Patch
-import app.revanced.patcher.util.patch.implementation.DexPatchBundle
+import app.revanced.patcher.util.patch.impl.DexPatchBundle
 import dalvik.system.DexClassLoader
 import io.flutter.embedding.android.FlutterActivity
 import io.flutter.embedding.engine.FlutterEngine
@@ -41,9 +41,10 @@ class MainActivity : FlutterActivity() {
         mainChannel.setMethodCallHandler { call, result ->
             when (call.method) {
                 "loadPatches" -> {
-                    val pathBundlesPaths = call.argument<List<String>>("pathBundlesPaths")
+                    val zipPatchBundlePath = call.argument<String>("zipPatchBundlePath")
-                    if (pathBundlesPaths != null) {
+                    val cacheDirPath = call.argument<String>("cacheDirPath")
-                        loadPatches(result, pathBundlesPaths)
+                    if (zipPatchBundlePath != null && cacheDirPath != null) {
+                        loadPatches(result, zipPatchBundlePath, cacheDirPath)
                     } else {
                         result.notImplemented()
                     }
@@ -100,23 +101,25 @@ class MainActivity : FlutterActivity() {
         }
     }
 
-    fun loadPatches(result: MethodChannel.Result, pathBundlesPaths: List<String>) {
+    fun loadPatches(
+            result: MethodChannel.Result,
+            zipPatchBundlePath: String,
+            cacheDirPath: String
+    ) {
         Thread(
                         Runnable {
-                            pathBundlesPaths.forEach { path ->
                             patches.addAll(
                                     DexPatchBundle(
-                                                        path,
+                                                    zipPatchBundlePath,
                                                     DexClassLoader(
-                                                                path,
+                                                            zipPatchBundlePath,
-                                                                applicationContext.cacheDir.path,
+                                                            cacheDirPath,
                                                             null,
                                                             javaClass.classLoader
                                                     )
                                             )
                                             .loadPatches()
                             )
-                            }
                             handler.post { result.success(null) }
                         }
                 )
@@ -185,7 +188,8 @@ class MainActivity : FlutterActivity() {
         val patchedFile = File(patchedFilePath)
         val outFile = File(outFilePath)
         val integrations = File(integrationsPath)
-        val filteredPatches = patches.filter { patch -> selectedPatches.any { it == patch.patchName } }
+        val filteredPatches =
+                patches.filter { patch -> selectedPatches.any { it == patch.patchName } }
 
         Thread(
                         Runnable {
@@ -289,7 +293,7 @@ class MainActivity : FlutterActivity() {
                                 res.dexFiles.forEach {
                                     file.addEntryCompressData(
                                             ZipEntry.createWithName(it.name),
-                                            it.dexFileInputStream.readBytes()
+                                            it.stream.readBytes()
                                     )
                                 }
                                 res.resourceFile?.let {

lib/services/github_api.dart

@@ -17,7 +17,11 @@ class GithubAPI {
     }
   }
 
-  Future<File?> latestReleaseFile(String org, repoName) async {
+  Future<File?> latestReleaseFile(
+    String extension,
+    String org,
+    repoName,
+  ) async {
     try {
       var latestRelease = await _github.repositories.getLatestRelease(
         RepositorySlug(org, repoName),
@@ -25,7 +29,7 @@ class GithubAPI {
       String? url = latestRelease.assets
           ?.firstWhere((asset) =>
               asset.name != null &&
-              (asset.name!.endsWith('.dex') || asset.name!.endsWith('.apk')) &&
+              asset.name!.endsWith(extension) &&
               !asset.name!.contains('-sources') &&
               !asset.name!.contains('-javadoc'))
           .browserDownloadUrl;

lib/services/manager_api.dart

@@ -6,30 +6,28 @@ import 'package:revanced_manager/services/github_api.dart';
 class ManagerAPI {
   final GithubAPI _githubAPI = GithubAPI();
 
-  Future<File?> downloadPatches() async {
+  Future<File?> downloadPatches(String extension) async {
-    return await _githubAPI.latestReleaseFile(ghOrg, patchesRepo);
+    return await _githubAPI.latestReleaseFile(extension, ghOrg, patchesRepo);
   }
 
-  Future<File?> downloadIntegrations() async {
+  Future<File?> downloadIntegrations(String extension) async {
-    return await _githubAPI.latestReleaseFile(ghOrg, integrationsRepo);
-  }
-
-  Future<File?> downloadManager() async {
     return await _githubAPI.latestReleaseFile(
-      'Aunali321',
+      extension,
-      'revanced-manager-flutter',
+      ghOrg,
+      integrationsRepo,
     );
   }
 
+  Future<File?> downloadManager(String extension) async {
+    return await _githubAPI.latestReleaseFile(extension, ghOrg, managerRepo);
+  }
+
   Future<String?> getLatestPatchesVersion() async {
     return await _githubAPI.latestReleaseVersion(ghOrg, patchesRepo);
   }
 
   Future<String?> getLatestManagerVersion() async {
-    return await _githubAPI.latestReleaseVersion(
+    return await _githubAPI.latestReleaseVersion(ghOrg, managerRepo);
-      'Aunali321',
-      'revanced-manager-flutter',
-    );
   }
 
   Future<String> getCurrentManagerVersion() async {

lib/services/patcher_api.dart

@@ -2,6 +2,7 @@ import 'dart:io';
 import 'package:app_installer/app_installer.dart';
 import 'package:device_apps/device_apps.dart';
 import 'package:flutter/services.dart';
+import 'package:flutter_archive/flutter_archive.dart';
 import 'package:injectable/injectable.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:revanced_manager/models/patch.dart';
@@ -21,29 +22,47 @@ class PatcherAPI {
   Directory? _tmpDir;
   Directory? _workDir;
   Directory? _cacheDir;
-  File? _patchBundleFile;
+  File? _zipPatchBundleFile;
   File? _integrations;
   File? _inputFile;
   File? _patchedFile;
   File? _outFile;
 
+  Future<void> initPatcher() async {
+    _tmpDir = await getTemporaryDirectory();
+    _workDir = _tmpDir!.createTempSync('tmp-');
+    _inputFile = File('${_workDir!.path}/base.apk');
+    _patchedFile = File('${_workDir!.path}/patched.apk');
+    _outFile = File('${_workDir!.path}/out.apk');
+    _cacheDir = Directory('${_workDir!.path}/cache');
+    _cacheDir!.createSync();
+  }
+
   Future<void> loadPatches() async {
-    if (_patchBundleFile == null) {
+    if (_cacheDir == null) {
-      _patchBundleFile = await _managerAPI.downloadPatches();
+      await initPatcher();
-      if (_patchBundleFile != null) {
+    }
+    if (_zipPatchBundleFile == null) {
+      File? patchBundleDexFile = await _managerAPI.downloadPatches('.dex');
+      File? patchBundleJarFile = await _managerAPI.downloadPatches('.jar');
+      if (patchBundleDexFile != null && patchBundleJarFile != null) {
+        await joinPatchBundleFiles(patchBundleDexFile, patchBundleJarFile);
+        if (_zipPatchBundleFile != null) {
           await patcherChannel.invokeMethod<bool>(
             'loadPatches',
             {
-            'pathBundlesPaths': <String>[_patchBundleFile!.absolute.path],
+              'zipPatchBundlePath': _zipPatchBundleFile!.path,
+              'cacheDirPath': _cacheDir!.path,
             },
           );
         }
       }
     }
+  }
 
   Future<List<ApplicationWithIcon>> getFilteredInstalledApps() async {
     List<ApplicationWithIcon> filteredPackages = [];
-    if (_patchBundleFile != null) {
+    if (_zipPatchBundleFile != null) {
       try {
         List<String>? patchesPackages = await patcherChannel
             .invokeListMethod<String>('getCompatiblePackages');
@@ -71,7 +90,7 @@ class PatcherAPI {
     PatchedApplication? selectedApp,
   ) async {
     List<Patch> filteredPatches = [];
-    if (_patchBundleFile != null && selectedApp != null) {
+    if (_zipPatchBundleFile != null && selectedApp != null) {
       try {
         var patches =
             await patcherChannel.invokeListMethod<Map<dynamic, dynamic>>(
@@ -112,7 +131,7 @@ class PatcherAPI {
     PatchedApplication? selectedApp,
   ) async {
     List<Patch> appliedPatches = [];
-    if (_patchBundleFile != null && selectedApp != null) {
+    if (_zipPatchBundleFile != null && selectedApp != null) {
       try {
         var patches =
             await patcherChannel.invokeListMethod<Map<dynamic, dynamic>>(
@@ -148,17 +167,12 @@ class PatcherAPI {
     return appliedPatches;
   }
 
-  Future<void> initPatcher(bool mergeIntegrations) async {
+  Future<void> mergeIntegrations(bool mergeIntegrations) async {
     if (mergeIntegrations) {
-      _integrations = await _managerAPI.downloadIntegrations();
+      _integrations = await _managerAPI.downloadIntegrations('.apk');
+    } else {
+      _integrations = null;
     }
-    _tmpDir = await getTemporaryDirectory();
-    _workDir = _tmpDir!.createTempSync('tmp-');
-    _inputFile = File('${_workDir!.path}/base.apk');
-    _patchedFile = File('${_workDir!.path}/patched.apk');
-    _outFile = File('${_workDir!.path}/out.apk');
-    _cacheDir = Directory('${_workDir!.path}/cache');
-    _cacheDir!.createSync();
   }
 
   Future<void> runPatcher(
@@ -234,4 +248,26 @@ class PatcherAPI {
       await _rootAPI.deleteApp(patchedApp.packageName, patchedApp.apkFilePath);
     }
   }
+
+  Future<void> joinPatchBundleFiles(
+    File patchBundleDexFile,
+    File patchBundleJarFile,
+  ) async {
+    _zipPatchBundleFile = File('${_workDir!.path}/join.zip');
+    Directory joinDir = Directory('${_cacheDir!.path}/join');
+    try {
+      await ZipFile.extractToDirectory(
+        zipFile: patchBundleJarFile,
+        destinationDir: joinDir,
+      );
+      patchBundleDexFile.copySync('${joinDir.path}/classes.dex');
+      await ZipFile.createFromDirectory(
+        sourceDir: joinDir,
+        zipFile: _zipPatchBundleFile!,
+        recurseSubDirs: true,
+      );
+    } on Exception {
+      _zipPatchBundleFile = null;
+    }
+  }
 }

lib/ui/views/home/home_viewmodel.dart

@@ -89,7 +89,7 @@ class HomeViewModel extends BaseViewModel {
       toastLength: Toast.LENGTH_LONG,
       gravity: ToastGravity.CENTER,
     );
-    File? managerApk = await _managerAPI.downloadManager();
+    File? managerApk = await _managerAPI.downloadManager('.apk');
     if (managerApk != null) {
       flutterLocalNotificationsPlugin.show(
         0,

lib/ui/views/installer/installer_viewmodel.dart

@@ -111,7 +111,7 @@ class InstallerViewModel extends BaseViewModel {
             'com.google.android.apps.youtube.music') {
           resourcePatching = true;
         }
-        await _patcherAPI.initPatcher(mergeIntegrations);
+        await _patcherAPI.mergeIntegrations(mergeIntegrations);
         await _patcherAPI.runPatcher(
           apkFilePath,
           _patches,

pubspec.yaml

@@ -21,6 +21,7 @@ dependencies:
   file_picker: ^5.0.1
   flutter:
     sdk: flutter
+  flutter_archive: ^5.0.0
   flutter_background: ^1.1.0
   flutter_cache_manager: ^3.3.0
   flutter_i18n: ^0.32.4