From 1e8c2cd61cb453c1142829e4156cff942799dfcf Mon Sep 17 00:00:00 2001 From: Ankit Saini Date: Tue, 1 Nov 2022 10:04:49 +0530 Subject: [PATCH] Reverting accidental style changes --- .../revanced/manager/flutter/MainActivity.kt | 36 ++++++++----------- 1 file changed, 15 insertions(+), 21 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 index b32870fed9..f8b7055a58 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 @@ -44,11 +44,8 @@ class MainActivity : FlutterActivity() { override fun configureFlutterEngine(@NonNull flutterEngine: FlutterEngine) { super.configureFlutterEngine(flutterEngine) val mainChannel = MethodChannel(flutterEngine.dartExecutor.binaryMessenger, PATCHER_CHANNEL) - installerChannel = - MethodChannel(flutterEngine.dartExecutor.binaryMessenger, INSTALLER_CHANNEL) - exporterChannel = - MethodChannel(flutterEngine.dartExecutor.binaryMessenger, EXPORTER_CHANNEL) - + installerChannel = MethodChannel(flutterEngine.dartExecutor.binaryMessenger, INSTALLER_CHANNEL) + exporterChannel = MethodChannel(flutterEngine.dartExecutor.binaryMessenger, EXPORTER_CHANNEL) mainChannel.setMethodCallHandler { call, result -> when (call.method) { "runPatcher" -> { @@ -183,8 +180,7 @@ class MainActivity : FlutterActivity() { Thread { try { - val patches = - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.CUPCAKE) { + val patches = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.CUPCAKE) { PatchBundle.Dex( patchBundleFilePath, DexClassLoader( @@ -193,11 +189,7 @@ class MainActivity : FlutterActivity() { null, javaClass.classLoader ) - ) - .loadPatches() - .filter { patch -> - selectedPatches.any { it == patch.patchName } - } + ).loadPatches().filter { patch -> selectedPatches.any { it == patch.patchName } } } else { TODO("VERSION.SDK_INT < CUPCAKE") } @@ -273,7 +265,11 @@ class MainActivity : FlutterActivity() { handler.post { installerChannel.invokeMethod( "update", - mapOf("progress" to 0.5, "header" to "", "log" to msg) + mapOf( + "progress" to 0.5, + "header" to "", + "log" to msg + ) ) } return@forEach @@ -327,14 +323,12 @@ class MainActivity : FlutterActivity() { ) } - // Signer("ReVanced", "s3cur3p@ssw0rd").signApk(patchedFile, outFile, - // keyStoreFile) + // Signer("ReVanced", "s3cur3p@ssw0rd").signApk(patchedFile, outFile, keyStoreFile) try { - Signer("ReVanced", "s3cur3p@ssw0rd") - .signApk(patchedFile, outFile, keyStoreFile) + Signer("ReVanced", "s3cur3p@ssw0rd").signApk(patchedFile, outFile, keyStoreFile) } catch (e: Exception) { - // log to console + //log to console print("Error signing apk: ${e.message}") e.printStackTrace() } @@ -363,14 +357,14 @@ class MainActivity : FlutterActivity() { } } handler.post { result.success(null) } - } - .start() + }.start() } inner class ManagerLogger : Logger { override fun error(msg: String) { handler.post { - installerChannel.invokeMethod( + installerChannel + .invokeMethod( "update", mapOf("progress" to -1.0, "header" to "", "log" to msg) )