From 9b8ba8ff52d3474049d487f75d101b7868a888cf Mon Sep 17 00:00:00 2001 From: Samuel Carlsson Date: Mon, 1 Aug 2016 19:42:35 +0200 Subject: [PATCH 1/2] Refactor: Using functions/fields instead of classes. Cleaning up PackageManager. --- .../jadb/managers/PackageManager.java | 66 ++++++------------- .../test/integration/PackageMangerTests.java | 2 +- 2 files changed, 20 insertions(+), 48 deletions(-) diff --git a/src/se/vidstige/jadb/managers/PackageManager.java b/src/se/vidstige/jadb/managers/PackageManager.java index ce137c0..474341f 100644 --- a/src/se/vidstige/jadb/managers/PackageManager.java +++ b/src/se/vidstige/jadb/managers/PackageManager.java @@ -79,7 +79,7 @@ public class PackageManager { } 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 { @@ -93,7 +93,7 @@ public class PackageManager { } // - public static abstract class InstallOptions { + public static class InstallOptions { InstallOptions(String ... varargs) { for(String str: varargs) { stringBuilder.append(str).append(" "); @@ -107,62 +107,34 @@ public class PackageManager { } } + public static final InstallOptions WITH_FORWARD_LOCK = new InstallOptions("-l"); - public static class WITH_FORWARD_LOCK extends InstallOptions { - public WITH_FORWARD_LOCK() { - super("-l"); - } + public static final InstallOptions REINSTALL_KEEPING_DATA = + new InstallOptions("-r"); + + public static final InstallOptions ALLOW_TEST_APK = + new InstallOptions("-t"); + + public static InstallOptions WITH_INSTALLER_PACKAGE_NAME(String name) + { + return new InstallOptions("-t", name); } - public static class REINSTALL_KEEPING_DATA extends InstallOptions { - public REINSTALL_KEEPING_DATA() { - super("-r"); - } + public static InstallOptions ON_SHARED_MASS_STORAGE(String name) { + return new InstallOptions("-s", name); } - public static final class ALLOW_TEST_APK extends InstallOptions { - public ALLOW_TEST_APK() { - super("-t"); - } + public static InstallOptions ON_INTERNAL_SYSTEM_MEMORY(String name) { + return new InstallOptions("-f", name); } - public static final class WITH_INSTALLER_PACKAGE_NAME extends InstallOptions { - public WITH_INSTALLER_PACKAGE_NAME(String name) { - 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"); - } - } + public static final InstallOptions ALLOW_VERSION_DOWNGRADE = + new InstallOptions("-d"); /** * This option is sSupported only from Android 6.X+ */ - public static final class GRANT_ALL_PERMISSIONS extends InstallOptions { - public GRANT_ALL_PERMISSIONS() { - super("-g"); - } - } + public static final InstallOptions GRANT_ALL_PERMISSIONS = new InstallOptions("-g"); - public static final class CUSTOM_PARAMETER extends InstallOptions { - public CUSTOM_PARAMETER(String ... varargs) { - super(varargs); - } - } // } diff --git a/test/se/vidstige/jadb/test/integration/PackageMangerTests.java b/test/se/vidstige/jadb/test/integration/PackageMangerTests.java index b985d7f..6941e21 100644 --- a/test/se/vidstige/jadb/test/integration/PackageMangerTests.java +++ b/test/se/vidstige/jadb/test/integration/PackageMangerTests.java @@ -57,7 +57,7 @@ public class PackageMangerTests { @Test public void testInstallWithOptionsUninstallCycle() throws Exception { 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")); } } From 72c632001e014dcca71079ac6ee270c1c12ac979 Mon Sep 17 00:00:00 2001 From: Samuel Carlsson Date: Mon, 1 Aug 2016 19:45:38 +0200 Subject: [PATCH 2/2] Refactor: Renaming to `InstallOption` Removing plural to keep things clear. --- .../jadb/managers/PackageManager.java | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/src/se/vidstige/jadb/managers/PackageManager.java b/src/se/vidstige/jadb/managers/PackageManager.java index 474341f..f630368 100644 --- a/src/se/vidstige/jadb/managers/PackageManager.java +++ b/src/se/vidstige/jadb/managers/PackageManager.java @@ -69,11 +69,11 @@ public class PackageManager { install(apkFile, new ArrayList(0)); } - public void installWithOptions(File apkFile, List options) throws IOException, JadbException { + public void installWithOptions(File apkFile, List options) throws IOException, JadbException { List optionsAsStr = new ArrayList<>(options.size()); - for(InstallOptions installOptions: options) { - optionsAsStr.add(installOptions.getStringRepresentation()); + for(InstallOption installOption : options) { + optionsAsStr.add(installOption.getStringRepresentation()); } install(apkFile, optionsAsStr); } @@ -92,9 +92,9 @@ public class PackageManager { InputStream s = device.executeShell("monkey", "-p", name.toString(), "-c", "android.intent.category.LAUNCHER", "1"); } - // - public static class InstallOptions { - InstallOptions(String ... varargs) { + // + public static class InstallOption { + InstallOption(String ... varargs) { for(String str: varargs) { stringBuilder.append(str).append(" "); } @@ -107,34 +107,34 @@ public class PackageManager { } } - public static final InstallOptions WITH_FORWARD_LOCK = new InstallOptions("-l"); + public static final InstallOption WITH_FORWARD_LOCK = new InstallOption("-l"); - public static final InstallOptions REINSTALL_KEEPING_DATA = - new InstallOptions("-r"); + public static final InstallOption REINSTALL_KEEPING_DATA = + new InstallOption("-r"); - public static final InstallOptions ALLOW_TEST_APK = - new InstallOptions("-t"); + public static final InstallOption ALLOW_TEST_APK = + new InstallOption("-t"); - public static InstallOptions WITH_INSTALLER_PACKAGE_NAME(String name) + public static InstallOption WITH_INSTALLER_PACKAGE_NAME(String name) { - return new InstallOptions("-t", name); + return new InstallOption("-t", name); } - public static InstallOptions ON_SHARED_MASS_STORAGE(String name) { - return new InstallOptions("-s", name); + public static InstallOption ON_SHARED_MASS_STORAGE(String name) { + return new InstallOption("-s", name); } - public static InstallOptions ON_INTERNAL_SYSTEM_MEMORY(String name) { - return new InstallOptions("-f", name); + public static InstallOption ON_INTERNAL_SYSTEM_MEMORY(String name) { + return new InstallOption("-f", name); } - public static final InstallOptions ALLOW_VERSION_DOWNGRADE = - new InstallOptions("-d"); + public static final InstallOption ALLOW_VERSION_DOWNGRADE = + new InstallOption("-d"); /** * This option is sSupported only from Android 6.X+ */ - public static final InstallOptions GRANT_ALL_PERMISSIONS = new InstallOptions("-g"); + public static final InstallOption GRANT_ALL_PERMISSIONS = new InstallOption("-g"); // }