File tree 2 files changed +10
-14
lines changed
src/main/kotlin/app/revanced/utils/adb
2 files changed +10
-14
lines changed Original file line number Diff line number Diff line change @@ -2,11 +2,12 @@ package app.revanced.utils.adb
2
2
3
3
import se.vidstige.jadb.JadbConnection
4
4
import se.vidstige.jadb.JadbDevice
5
+ import se.vidstige.jadb.managers.PackageManager
5
6
import java.io.File
6
7
import java.util.concurrent.Executors
7
8
8
9
internal class Adb (
9
- private val apk : File ,
10
+ private val file : File ,
10
11
private val packageName : String ,
11
12
deviceName : String ,
12
13
private val install : Boolean = false ,
@@ -27,13 +28,11 @@ internal class Adb(
27
28
}
28
29
29
30
internal fun deploy () {
30
-
31
31
if (install) {
32
- TODO (" support installing the apk" )
33
- device.run (Constants .COMMAND_INSTALL_APK .replacePlaceholder(" \" $apk \" " ))
32
+ PackageManager (device).install(file)
34
33
} else {
35
34
// push patched file
36
- device.copy(Constants .PATH_INIT_PUSH , apk )
35
+ device.copy(Constants .PATH_INIT_PUSH , file )
37
36
38
37
// create revanced path
39
38
device.run (" ${Constants .COMMAND_CREATE_DIR } ${Constants .PATH_REVANCED } " )
@@ -61,13 +60,13 @@ internal class Adb(
61
60
device.run (Constants .PATH_UMOUNT .replacePlaceholder())
62
61
// mount the apk
63
62
device.run (Constants .PATH_MOUNT .replacePlaceholder())
64
- }
65
63
66
- // relaunch app
67
- device.run (Constants .COMMAND_RESTART .replacePlaceholder())
64
+ // relaunch app
65
+ device.run (Constants .COMMAND_RESTART .replacePlaceholder())
68
66
69
- // log the app
70
- log()
67
+ // log the app
68
+ log()
69
+ }
71
70
}
72
71
73
72
private fun log () {
Original file line number Diff line number Diff line change @@ -15,7 +15,7 @@ internal object Constants {
15
15
private const val NAME_MOUNT_SCRIPT = " mount_revanced_$PLACEHOLDER .sh"
16
16
17
17
// 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"
19
19
20
20
// revanced path
21
21
internal const val PATH_REVANCED = " /data/adb/revanced/"
@@ -37,9 +37,6 @@ internal object Constants {
37
37
// install umount script & set permissions
38
38
internal const val COMMAND_INSTALL_UMOUNT = " mv $PATH_INIT_PUSH $PATH_UMOUNT && $COMMAND_CHMOD_MOUNT $PATH_UMOUNT "
39
39
40
- // install apk & cleanup
41
- internal const val COMMAND_INSTALL_APK = " install $PLACEHOLDER "
42
-
43
40
// unmount script
44
41
internal val CONTENT_UMOUNT_SCRIPT =
45
42
"""
You can’t perform that action at this time.
0 commit comments