From b52e49d90acac2c47ff6c30f691a464eebf862a0 Mon Sep 17 00:00:00 2001
From: oSumAtrIX <johan.melkonyan1@web.de>
Date: Sat, 9 Mar 2024 04:39:48 +0100
Subject: [PATCH] build: Bump dependencies to fix signing issues

---
 android/app/build.gradle                           |  7 +++----
 .../app/revanced/manager/flutter/MainActivity.kt   | 14 ++++++--------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index f1473e85..ea6a2456 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -113,9 +113,8 @@ flutter {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.22"
+    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.22")
 
-    // ReVanced
-    implementation "app.revanced:revanced-patcher:19.3.1"
-    implementation "app.revanced:revanced-library:2.1.0"
+    implementation("app.revanced:revanced-patcher:19.3.1")
+    implementation("app.revanced:revanced-library:2.2.0")
 }
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 e3ac9beb..f0fc99b6 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
@@ -9,7 +9,6 @@ import android.os.Handler
 import android.os.Looper
 import app.revanced.library.ApkUtils
 import app.revanced.library.ApkUtils.applyTo
-import app.revanced.library.ApkUtils.sign
 import app.revanced.manager.flutter.utils.Aapt
 import app.revanced.manager.flutter.utils.packageInstaller.InstallerReceiver
 import app.revanced.manager.flutter.utils.packageInstaller.UninstallerReceiver
@@ -339,16 +338,15 @@ class MainActivity : FlutterActivity() {
                     patcher.get()
                 }
 
-                inFile.copyTo(outFile)
+                if (cancel(patcher::close)) return@Thread
+
+                patcherResult.applyTo(inFile)
 
                 if (cancel(patcher::close)) return@Thread
 
-                patcherResult.applyTo(outFile)
-
-                if (cancel(patcher::close)) return@Thread
-                updateProgress(0.8, "Signing...", "")
-
-                outFile.sign(
+                ApkUtils.sign(
+                    inFile,
+                    outFile,
                     ApkUtils.SigningOptions(
                         keyStoreFile,
                         keystorePassword,