Skip to content

Commit d1ceab4

Browse files
committed
feat: support for --install
1 parent cf1d512 commit d1ceab4

File tree

2 files changed

+10
-14
lines changed

2 files changed

+10
-14
lines changed

src/main/kotlin/app/revanced/utils/adb/Adb.kt

+9-10
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@ package app.revanced.utils.adb
22

33
import se.vidstige.jadb.JadbConnection
44
import se.vidstige.jadb.JadbDevice
5+
import se.vidstige.jadb.managers.PackageManager
56
import java.io.File
67
import java.util.concurrent.Executors
78

89
internal class Adb(
9-
private val apk: File,
10+
private val file: File,
1011
private val packageName: String,
1112
deviceName: String,
1213
private val install: Boolean = false,
@@ -27,13 +28,11 @@ internal class Adb(
2728
}
2829

2930
internal fun deploy() {
30-
3131
if (install) {
32-
TODO("support installing the apk")
33-
device.run(Constants.COMMAND_INSTALL_APK.replacePlaceholder("\"$apk\""))
32+
PackageManager(device).install(file)
3433
} else {
3534
// push patched file
36-
device.copy(Constants.PATH_INIT_PUSH, apk)
35+
device.copy(Constants.PATH_INIT_PUSH, file)
3736

3837
// create revanced path
3938
device.run("${Constants.COMMAND_CREATE_DIR} ${Constants.PATH_REVANCED}")
@@ -61,13 +60,13 @@ internal class Adb(
6160
device.run(Constants.PATH_UMOUNT.replacePlaceholder())
6261
// mount the apk
6362
device.run(Constants.PATH_MOUNT.replacePlaceholder())
64-
}
6563

66-
// relaunch app
67-
device.run(Constants.COMMAND_RESTART.replacePlaceholder())
64+
// relaunch app
65+
device.run(Constants.COMMAND_RESTART.replacePlaceholder())
6866

69-
// log the app
70-
log()
67+
// log the app
68+
log()
69+
}
7170
}
7271

7372
private fun log() {

src/main/kotlin/app/revanced/utils/adb/Constants.kt

+1-4
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ internal object Constants {
1515
private const val NAME_MOUNT_SCRIPT = "mount_revanced_$PLACEHOLDER.sh"
1616

1717
// initial directory to push files to via adb push
18-
internal const val PATH_INIT_PUSH = "/sdcard/revanced.delete"
18+
internal const val PATH_INIT_PUSH = "/data/local/tmp/revanced.delete"
1919

2020
// revanced path
2121
internal const val PATH_REVANCED = "/data/adb/revanced/"
@@ -37,9 +37,6 @@ internal object Constants {
3737
// install umount script & set permissions
3838
internal const val COMMAND_INSTALL_UMOUNT = "mv $PATH_INIT_PUSH $PATH_UMOUNT && $COMMAND_CHMOD_MOUNT $PATH_UMOUNT"
3939

40-
// install apk & cleanup
41-
internal const val COMMAND_INSTALL_APK = "install $PLACEHOLDER"
42-
4340
// unmount script
4441
internal val CONTENT_UMOUNT_SCRIPT =
4542
"""

0 commit comments

Comments
 (0)