From 8275792f4553aef3c2728f5ea2fd850b68135c82 Mon Sep 17 00:00:00 2001
From: oSumAtrIX <johan.melkonyan1@web.de>
Date: Thu, 6 Oct 2022 11:26:20 +0200
Subject: [PATCH 1/2] chore: bump patcher dependency version to v6.0.0 (#355)

---
 android/app/build.gradle                                    | 2 +-
 .../kotlin/app/revanced/manager/flutter/MainActivity.kt     | 6 +++---
 pubspec.yaml                                                | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index b1959c39..ff73fbb6 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -71,7 +71,7 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
     // ReVanced
-    implementation "app.revanced:revanced-patcher:5.1.2"
+    implementation "app.revanced:revanced-patcher:6.0.0"
 
     // Signing & aligning
     implementation("org.bouncycastle:bcpkix-jdk15on:1.70")
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
index b3477146..0a186a39 100644
--- a/android/app/src/main/kotlin/app/revanced/manager/flutter/MainActivity.kt
+++ b/android/app/src/main/kotlin/app/revanced/manager/flutter/MainActivity.kt
@@ -13,7 +13,7 @@ import app.revanced.patcher.Patcher
 import app.revanced.patcher.PatcherOptions
 import app.revanced.patcher.extensions.PatchExtensions.patchName
 import app.revanced.patcher.logging.Logger
-import app.revanced.patcher.util.patch.impl.DexPatchBundle
+import app.revanced.patcher.util.patch.PatchBundle
 import dalvik.system.DexClassLoader
 import io.flutter.embedding.android.FlutterActivity
 import io.flutter.embedding.engine.FlutterEngine
@@ -100,7 +100,7 @@ class MainActivity : FlutterActivity() {
         Thread {
             try {   
                 val patches = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.CUPCAKE) {
-                    DexPatchBundle(
+                    PatchBundle.Dex(
                         patchBundleFilePath,
                         DexClassLoader(
                             patchBundleFilePath,
@@ -178,7 +178,7 @@ class MainActivity : FlutterActivity() {
                 }
 
                 patcher.addPatches(patches)
-                patcher.applyPatches().forEach { (patch, res) ->
+                patcher.executePatches().forEach { (patch, res) ->
                     if (res.isSuccess) {
                         val msg = "[success] $patch"
                         handler.post {
diff --git a/pubspec.yaml b/pubspec.yaml
index f9915d08..8d350819 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -4,7 +4,7 @@ homepage: https://github.com/revanced/revanced-manager
 
 publish_to: 'none'
 
-version: 0.0.28+28
+version: 0.0.29+29
 
 environment:
   sdk: ">=2.17.5 <3.0.0"

From da94dfba7008ffb2702f77a0e74a882781f1e325 Mon Sep 17 00:00:00 2001
From: Ushie <ushiekane@gmail.com>
Date: Thu, 6 Oct 2022 12:40:25 +0300
Subject: [PATCH 2/2] build: Android Studio project build config

---
 .run/main.dart.run.xml | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 .run/main.dart.run.xml

diff --git a/.run/main.dart.run.xml b/.run/main.dart.run.xml
new file mode 100644
index 00000000..4767aff8
--- /dev/null
+++ b/.run/main.dart.run.xml
@@ -0,0 +1,6 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="main.dart" type="FlutterRunConfigurationType" factoryName="Flutter">
+    <option name="filePath" value="$PROJECT_DIR$/lib/main.dart" />
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file