ReVanced-Mirror/revanced-manager
1
0
Fork 0
mirror of https://github.com/revanced/revanced-manager synced 2024-05-14 13:56:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: Prevent Manager from crashing when a patcher exception occurs and print its stack trace on installer's log

Browse Source
This commit is contained in:
Alberto Ponces 2022-09-23 00:38:42 +01:00
parent f9242c1958
commit 1028ec8e2a
2 changed files with 149 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

250
android/app/src/main/kotlin/app/revanced/manager/flutter/MainActivity.kt
View File

@ -74,7 +74,6 @@ class MainActivity : FlutterActivity() {
result.notImplemented() result.notImplemented()
} }
} }
else -> result.notImplemented() else -> result.notImplemented()
} }
} }
@ -101,161 +100,174 @@ class MainActivity : FlutterActivity() {
val integrations = File(integrationsPath) val integrations = File(integrationsPath)
val keyStoreFile = File(keyStoreFilePath) val keyStoreFile = File(keyStoreFilePath)
val patches = DexPatchBundle(
patchBundleFilePath,
DexClassLoader(
patchBundleFilePath,
cacheDirPath,
null,
javaClass.classLoader
)
).loadPatches().filter { patch -> selectedPatches.any { it == patch.patchName } }
Thread { Thread {
handler.post { try {
installerChannel.invokeMethod( val patches = DexPatchBundle(
"update", patchBundleFilePath,
mapOf( DexClassLoader(
"progress" to 0.1, patchBundleFilePath,
"header" to "",
"log" to "Copying original apk"
)
)
}
originalFile.copyTo(inputFile, true)
handler.post {
installerChannel.invokeMethod(
"update",
mapOf(
"progress" to 0.2,
"header" to "Unpacking apk...",
"log" to "Unpacking input apk"
)
)
}
val patcher =
Patcher(
PatcherOptions(
inputFile,
cacheDirPath, cacheDirPath,
resourcePatching, null,
Aapt.binary(applicationContext).absolutePath, javaClass.classLoader
cacheDirPath,
logger = ManagerLogger()
) )
) ).loadPatches().filter { patch -> selectedPatches.any { it == patch.patchName } }
handler.post {
installerChannel.invokeMethod(
"update",
mapOf("progress" to 0.3, "header" to "", "log" to "")
)
}
if (mergeIntegrations) {
handler.post { handler.post {
installerChannel.invokeMethod( installerChannel.invokeMethod(
"update", "update",
mapOf( mapOf(
"progress" to 0.4, "progress" to 0.1,
"header" to "Merging integrations...", "header" to "",
"log" to "Merging integrations" "log" to "Copying original apk"
) )
) )
} }
patcher.addFiles(listOf(integrations)) {} originalFile.copyTo(inputFile, true)
}
handler.post { handler.post {
installerChannel.invokeMethod( installerChannel.invokeMethod(
"update", "update",
mapOf( mapOf(
"progress" to 0.5, "progress" to 0.2,
"header" to "Applying patches...", "header" to "Unpacking apk...",
"log" to "" "log" to "Unpacking input apk"
)
) )
) }
} val patcher =
patcher.addPatches(patches) Patcher(
patcher.applyPatches().forEach { (patch, res) -> PatcherOptions(
if (res.isSuccess) { inputFile,
val msg = "[success] $patch" cacheDirPath,
resourcePatching,
Aapt.binary(applicationContext).absolutePath,
cacheDirPath,
logger = ManagerLogger()
)
)
handler.post {
installerChannel.invokeMethod(
"update",
mapOf("progress" to 0.3, "header" to "", "log" to "")
)
}
if (mergeIntegrations) {
handler.post { handler.post {
installerChannel.invokeMethod( installerChannel.invokeMethod(
"update", "update",
mapOf( mapOf(
"progress" to 0.5, "progress" to 0.4,
"header" to "", "header" to "Merging integrations...",
"log" to msg "log" to "Merging integrations"
) )
) )
} }
return@forEach patcher.addFiles(listOf(integrations)) {}
} }
val msg = "[error] $patch:" + res.exceptionOrNull()!!
handler.post { handler.post {
installerChannel.invokeMethod( installerChannel.invokeMethod(
"update", "update",
mapOf("progress" to 0.5, "header" to "", "log" to msg) mapOf(
"progress" to 0.5,
"header" to "Applying patches...",
"log" to ""
)
) )
} }
}
handler.post { patcher.addPatches(patches)
installerChannel.invokeMethod( patcher.applyPatches().forEach { (patch, res) ->
"update", if (res.isSuccess) {
mapOf( val msg = "[success] $patch"
"progress" to 0.7, handler.post {
"header" to "Repacking apk...", installerChannel.invokeMethod(
"log" to "Repacking patched apk" "update",
) mapOf(
) "progress" to 0.5,
} "header" to "",
val res = patcher.save() "log" to msg
ZipFile(patchedFile).use { file -> )
res.dexFiles.forEach { )
file.addEntryCompressData( }
ZipEntry.createWithName(it.name), return@forEach
it.stream.readBytes() }
val msg = "[error] $patch:" + res.exceptionOrNull()!!
handler.post {
installerChannel.invokeMethod(
"update",
mapOf("progress" to 0.5, "header" to "", "log" to msg)
)
}
}
handler.post {
installerChannel.invokeMethod(
"update",
mapOf(
"progress" to 0.7,
"header" to "Repacking apk...",
"log" to "Repacking patched apk"
)
) )
} }
res.resourceFile?.let { val res = patcher.save()
ZipFile(patchedFile).use { file ->
res.dexFiles.forEach {
file.addEntryCompressData(
ZipEntry.createWithName(it.name),
it.stream.readBytes()
)
}
res.resourceFile?.let {
file.copyEntriesFromFileAligned(
ZipFile(it),
ZipAligner::getEntryAlignment
)
}
file.copyEntriesFromFileAligned( file.copyEntriesFromFileAligned(
ZipFile(it), ZipFile(inputFile),
ZipAligner::getEntryAlignment ZipAligner::getEntryAlignment
) )
} }
file.copyEntriesFromFileAligned( handler.post {
ZipFile(inputFile), installerChannel.invokeMethod(
ZipAligner::getEntryAlignment "update",
) mapOf(
} "progress" to 0.9,
handler.post { "header" to "Signing apk...",
installerChannel.invokeMethod( "log" to ""
"update", )
mapOf(
"progress" to 0.9,
"header" to "Signing apk...",
"log" to ""
) )
) }
} Signer("ReVanced", "s3cur3p@ssw0rd").signApk(patchedFile, outFile, keyStoreFile)
Signer("ReVanced", "s3cur3p@ssw0rd").signApk(patchedFile, outFile, keyStoreFile)
handler.post { handler.post {
installerChannel.invokeMethod( installerChannel.invokeMethod(
"update", "update",
mapOf( mapOf(
"progress" to 1.0, "progress" to 1.0,
"header" to "Finished!", "header" to "Finished!",
"log" to "Finished!" "log" to "Finished!"
)
) )
) }
} catch (ex: Throwable) {
val stack = ex.stackTraceToString()
handler.post {
installerChannel.invokeMethod(
"update",
mapOf(
"progress" to -100.0,
"header" to "Aborting...",
"log" to "An error occurred! Aborting\nError:\n$stack"
)
)
}
} }
handler.post { result.success(null) } handler.post { result.success(null) }
} }.start()
.start()
} }
inner class ManagerLogger : Logger { inner class ManagerLogger : Logger {

26
lib/ui/views/installer/installer_viewmodel.dart
View File

@ -78,14 +78,20 @@ class InstallerViewModel extends BaseViewModel {
} }
void update(double value, String header, String log) { void update(double value, String header, String log) {
if (value > 0) { if (value >= 0.0) {
progress = value; progress = value;
} }
isPatching = progress == 1.0 ? false : true; if (value == 0.0) {
if (progress == 0.0) {
logs = ''; logs = '';
isPatching = true;
isInstalled = false; isInstalled = false;
hasErrors = false; hasErrors = false;
} else if (value == 1.0) {
isPatching = false;
hasErrors = false;
} else if (value == -100.0) {
isPatching = false;
hasErrors = true;
} }
if (header.isNotEmpty) { if (header.isNotEmpty) {
headerLogs = header; headerLogs = header;
@ -95,6 +101,9 @@ class InstallerViewModel extends BaseViewModel {
logs += '\n'; logs += '\n';
} }
logs += log; logs += log;
if (logs[logs.length - 1] == '\n') {
logs = logs.substring(0, logs.length - 1);
}
Future.delayed(const Duration(milliseconds: 500)).then((value) { Future.delayed(const Duration(milliseconds: 500)).then((value) {
scrollController.animateTo( scrollController.animateTo(
scrollController.position.maxScrollExtent, scrollController.position.maxScrollExtent,
@ -117,12 +126,14 @@ class InstallerViewModel extends BaseViewModel {
_patches, _patches,
); );
} catch (e) { } catch (e) {
hasErrors = true; update(
update(-1.0, 'Aborting...', 'An error occurred! Aborting\nError: $e'); -100.0,
'Aborting...',
'An error occurred! Aborting\nError:\n$e',
);
} }
} else { } else {
hasErrors = true; update(-100.0, 'Aborting...', 'No app or patches selected! Aborting');
update(-1.0, 'Aborting...', 'No app or patches selected! Aborting');
} }
if (FlutterBackground.isBackgroundExecutionEnabled) { if (FlutterBackground.isBackgroundExecutionEnabled) {
try { try {
@ -132,7 +143,6 @@ class InstallerViewModel extends BaseViewModel {
} }
} }
await Wakelock.disable(); await Wakelock.disable();
isPatching = false;
} }
void installResult(BuildContext context, bool installAsRoot) async { void installResult(BuildContext context, bool installAsRoot) async {