ReVanced/jadb
1
0
Fork 0
mirror of https://github.com/revanced/jadb.git synced 2025-05-08 02:14:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #31 from vidstige/refactor/install-options

Browse Source 
Refactor/install options
This commit is contained in:
Samuel Carlsson 2016-08-01 19:57:16 +02:00 committed by GitHub
commit a82a850a50
2 changed files with 25 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
src/se/vidstige/jadb/managers/PackageManager.java
View File

@ -69,17 +69,17 @@ public class PackageManager {
install(apkFile, new ArrayList<String>(0)); install(apkFile, new ArrayList<String>(0));
} }
public void installWithOptions(File apkFile, List<? extends InstallOptions> options) throws IOException, JadbException { public void installWithOptions(File apkFile, List<? extends InstallOption> options) throws IOException, JadbException {
List<String> optionsAsStr = new ArrayList<>(options.size()); List<String> optionsAsStr = new ArrayList<>(options.size());
for(InstallOptions installOptions: options) { for(InstallOption installOption : options) {
optionsAsStr.add(installOptions.getStringRepresentation()); optionsAsStr.add(installOption.getStringRepresentation());
} }
install(apkFile, optionsAsStr); install(apkFile, optionsAsStr);
} }
public void forceInstall(File apkFile) throws IOException, JadbException { public void forceInstall(File apkFile) throws IOException, JadbException {
installWithOptions(apkFile, Collections.singletonList(new REINSTALL_KEEPING_DATA())); installWithOptions(apkFile, Collections.singletonList(REINSTALL_KEEPING_DATA));
} }
public void uninstall(Package name) throws IOException, JadbException { public void uninstall(Package name) throws IOException, JadbException {
@ -92,9 +92,9 @@ public class PackageManager {
InputStream s = device.executeShell("monkey", "-p", name.toString(), "-c", "android.intent.category.LAUNCHER", "1"); InputStream s = device.executeShell("monkey", "-p", name.toString(), "-c", "android.intent.category.LAUNCHER", "1");
} }
//<editor-fold desc="InstallOptions"> //<editor-fold desc="InstallOption">
public static abstract class InstallOptions { public static class InstallOption {
InstallOptions(String ... varargs) { InstallOption(String ... varargs) {
for(String str: varargs) { for(String str: varargs) {
stringBuilder.append(str).append(" "); stringBuilder.append(str).append(" ");
} }
@ -107,62 +107,34 @@ public class PackageManager {
} }
} }
public static final InstallOption WITH_FORWARD_LOCK = new InstallOption("-l");
public static class WITH_FORWARD_LOCK extends InstallOptions { public static final InstallOption REINSTALL_KEEPING_DATA =
public WITH_FORWARD_LOCK() { new InstallOption("-r");
super("-l");
} public static final InstallOption ALLOW_TEST_APK =
new InstallOption("-t");
public static InstallOption WITH_INSTALLER_PACKAGE_NAME(String name)
{
return new InstallOption("-t", name);
} }
public static class REINSTALL_KEEPING_DATA extends InstallOptions { public static InstallOption ON_SHARED_MASS_STORAGE(String name) {
public REINSTALL_KEEPING_DATA() { return new InstallOption("-s", name);
super("-r");
}
} }
public static final class ALLOW_TEST_APK extends InstallOptions { public static InstallOption ON_INTERNAL_SYSTEM_MEMORY(String name) {
public ALLOW_TEST_APK() { return new InstallOption("-f", name);
super("-t");
}
} }
public static final class WITH_INSTALLER_PACKAGE_NAME extends InstallOptions { public static final InstallOption ALLOW_VERSION_DOWNGRADE =
public WITH_INSTALLER_PACKAGE_NAME(String name) { new InstallOption("-d");
super("-t", name);
}
}
public static final class ON_SHARED_MASS_STORAGE extends InstallOptions {
public ON_SHARED_MASS_STORAGE(String name) {
super("-s", name);
}
}
public static final class ON_INTERNAL_SYSTEM_MEMORY extends InstallOptions {
public ON_INTERNAL_SYSTEM_MEMORY(String name) {
super("-f", name);
}
}
public static final class ALLOW_VERSION_DOWNGRADE extends InstallOptions {
public ALLOW_VERSION_DOWNGRADE() {
super("-d");
}
}
/** /**
* This option is sSupported only from Android 6.X+ * This option is sSupported only from Android 6.X+
*/ */
public static final class GRANT_ALL_PERMISSIONS extends InstallOptions { public static final InstallOption GRANT_ALL_PERMISSIONS = new InstallOption("-g");
public GRANT_ALL_PERMISSIONS() {
super("-g");
}
}
public static final class CUSTOM_PARAMETER extends InstallOptions {
public CUSTOM_PARAMETER(String ... varargs) {
super(varargs);
}
}
//</editor-fold> //</editor-fold>
} }

2
test/se/vidstige/jadb/test/integration/PackageMangerTests.java
View File

@ -57,7 +57,7 @@ public class PackageMangerTests {
@Test @Test
public void testInstallWithOptionsUninstallCycle() throws Exception { public void testInstallWithOptionsUninstallCycle() throws Exception {
pm.install(miniApk); pm.install(miniApk);
pm.installWithOptions(miniApk, Arrays.asList(new PackageManager.REINSTALL_KEEPING_DATA(), new PackageManager.ALLOW_VERSION_DOWNGRADE())); pm.installWithOptions(miniApk, Arrays.asList(PackageManager.REINSTALL_KEEPING_DATA, PackageManager.ALLOW_VERSION_DOWNGRADE));
pm.uninstall(new Package("b.a")); pm.uninstall(new Package("b.a"));
} }
} }