ReVanced-Mirror/revanced-cli
1
0
Fork 0
mirror of https://github.com/revanced/revanced-cli.git synced 2024-12-27 20:45:49 +01:00
Code Issues Projects Releases Wiki Activity

feat: Show error about no installation device found at the beginning

Browse Source
This commit is contained in:
oSumAtrIX 2024-09-05 23:00:22 +04:00
parent ba159a35a9
commit 3300e6b433
No known key found for this signature in database
GPG Key ID: A9B3094ACDB604B4
1 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/main/kotlin/app/revanced/cli/command/PatchCommand.kt
View File

@ -245,6 +245,32 @@ internal object PatchCommand : Runnable {
keyStoreFilePath ?: outputFilePath.parentFile keyStoreFilePath ?: outputFilePath.parentFile
.resolve("${outputFilePath.nameWithoutExtension}.keystore") .resolve("${outputFilePath.nameWithoutExtension}.keystore")
val installer = if (deviceSerial != null) {
try {
if (mount) {
AdbRootInstaller(deviceSerial)
} else {
AdbInstaller(deviceSerial)
}
} catch (e: DeviceNotFoundException) {
if (deviceSerial!!.isNotEmpty()) {
logger.severe(
"Device with serial $deviceSerial not found to install to. " +
"Ensure the device is connected and the serial is correct when using the --install option.",
)
} else {
logger.severe(
"No device has been found to install to. " +
"Ensure a device is connected when using the --install option.",
)
}
return
}
} else {
null
}
// endregion // endregion
// region Load patches // region Load patches
@ -332,13 +358,7 @@ internal object PatchCommand : Runnable {
val deviceSerial = it.ifEmpty { null } val deviceSerial = it.ifEmpty { null }
runBlocking { runBlocking {
val result = if (mount) { when (val result = installer!!.install(Installer.Apk(outputFilePath, packageName))) {
AdbRootInstaller(deviceSerial)
} else {
AdbInstaller(deviceSerial)
}.install(Installer.Apk(outputFilePath, packageName))
when (result) {
RootInstallerResult.FAILURE -> logger.severe("Failed to mount the patched APK file") RootInstallerResult.FAILURE -> logger.severe("Failed to mount the patched APK file")
is AdbInstallerResult.Failure -> logger.severe(result.exception.toString()) is AdbInstallerResult.Failure -> logger.severe(result.exception.toString())
else -> logger.info("Installed the patched APK file") else -> logger.info("Installed the patched APK file")