From 91ddc838a7df9fe011245db3282b8257a8013d12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Sun, 11 May 2014 11:16:26 +0200 Subject: [PATCH] More cleanup in installer classes --- .../fdroid/installer/DefaultInstaller.java | 16 ++++++++-------- .../fdroid/installer/DefaultInstallerSdk14.java | 16 ++++++++-------- .../fdroid/fdroid/installer/RootInstaller.java | 6 +++--- .../installer/SystemPermissionInstaller.java | 15 ++++++++------- 4 files changed, 27 insertions(+), 26 deletions(-) diff --git a/src/org/fdroid/fdroid/installer/DefaultInstaller.java b/src/org/fdroid/fdroid/installer/DefaultInstaller.java index 3f7447341..48619f877 100644 --- a/src/org/fdroid/fdroid/installer/DefaultInstaller.java +++ b/src/org/fdroid/fdroid/installer/DefaultInstaller.java @@ -50,7 +50,7 @@ public class DefaultInstaller extends Installer { private static final int REQUEST_CODE_DELETE = 1; @Override - public void installPackageInternal(File apkFile) throws AndroidNotCompatibleException { + protected void installPackageInternal(File apkFile) throws AndroidNotCompatibleException { Intent intent = new Intent(); intent.setAction(Intent.ACTION_VIEW); intent.setDataAndType(Uri.fromFile(apkFile), @@ -63,7 +63,13 @@ public class DefaultInstaller extends Installer { } @Override - public void deletePackageInternal(String packageName) throws AndroidNotCompatibleException { + protected void installPackageInternal(List apkFiles) throws AndroidNotCompatibleException { + // TODO Auto-generated method stub + + } + + @Override + protected void deletePackageInternal(String packageName) throws AndroidNotCompatibleException { PackageInfo pkgInfo = null; try { pkgInfo = mPm.getPackageInfo(packageName, 0); @@ -106,10 +112,4 @@ public class DefaultInstaller extends Installer { return false; } - @Override - protected void installPackageInternal(List apkFiles) throws AndroidNotCompatibleException { - // TODO Auto-generated method stub - - } - } diff --git a/src/org/fdroid/fdroid/installer/DefaultInstallerSdk14.java b/src/org/fdroid/fdroid/installer/DefaultInstallerSdk14.java index deeb97125..4a33716ed 100644 --- a/src/org/fdroid/fdroid/installer/DefaultInstallerSdk14.java +++ b/src/org/fdroid/fdroid/installer/DefaultInstallerSdk14.java @@ -54,7 +54,7 @@ public class DefaultInstallerSdk14 extends Installer { @SuppressWarnings("deprecation") @Override - public void installPackageInternal(File apkFile) throws AndroidNotCompatibleException { + protected void installPackageInternal(File apkFile) throws AndroidNotCompatibleException { Intent intent = new Intent(); intent.setAction(Intent.ACTION_INSTALL_PACKAGE); intent.setData(Uri.fromFile(apkFile)); @@ -75,7 +75,13 @@ public class DefaultInstallerSdk14 extends Installer { } @Override - public void deletePackageInternal(String packageName) throws AndroidNotCompatibleException { + protected void installPackageInternal(List apkFiles) throws AndroidNotCompatibleException { + // TODO Auto-generated method stub + + } + + @Override + protected void deletePackageInternal(String packageName) throws AndroidNotCompatibleException { PackageInfo pkgInfo = null; try { pkgInfo = mPm.getPackageInfo(packageName, 0); @@ -130,10 +136,4 @@ public class DefaultInstallerSdk14 extends Installer { return false; } - @Override - protected void installPackageInternal(List apkFiles) throws AndroidNotCompatibleException { - // TODO Auto-generated method stub - - } - } diff --git a/src/org/fdroid/fdroid/installer/RootInstaller.java b/src/org/fdroid/fdroid/installer/RootInstaller.java index a00a50d59..d6d4079d7 100644 --- a/src/org/fdroid/fdroid/installer/RootInstaller.java +++ b/src/org/fdroid/fdroid/installer/RootInstaller.java @@ -52,7 +52,7 @@ public class RootInstaller extends Installer { } @Override - public void installPackageInternal(final File apkFile) throws AndroidNotCompatibleException { + protected void installPackageInternal(final File apkFile) throws AndroidNotCompatibleException { rootSession = createShellBuilder().open(new Shell.OnCommandResultListener() { // Callback to report whether the shell was successfully @@ -75,7 +75,7 @@ public class RootInstaller extends Installer { } @Override - public void installPackageInternal(final List apkFiles) + protected void installPackageInternal(final List apkFiles) throws AndroidNotCompatibleException { rootSession = createShellBuilder().open(new Shell.OnCommandResultListener() { @@ -99,7 +99,7 @@ public class RootInstaller extends Installer { } @Override - public void deletePackageInternal(final String packageName) + protected void deletePackageInternal(final String packageName) throws AndroidNotCompatibleException { rootSession = createShellBuilder().open(new Shell.OnCommandResultListener() { diff --git a/src/org/fdroid/fdroid/installer/SystemPermissionInstaller.java b/src/org/fdroid/fdroid/installer/SystemPermissionInstaller.java index 6dad5a78e..f97cd6858 100644 --- a/src/org/fdroid/fdroid/installer/SystemPermissionInstaller.java +++ b/src/org/fdroid/fdroid/installer/SystemPermissionInstaller.java @@ -125,7 +125,7 @@ public class SystemPermissionInstaller extends Installer { } @Override - public void installPackageInternal(File apkFile) throws AndroidNotCompatibleException { + protected void installPackageInternal(File apkFile) throws AndroidNotCompatibleException { Uri packageURI = Uri.fromFile(apkFile); try { mInstallMethod.invoke(mPm, new Object[] { @@ -137,7 +137,13 @@ public class SystemPermissionInstaller extends Installer { } @Override - public void deletePackageInternal(String packageName) throws AndroidNotCompatibleException { + protected void installPackageInternal(List apkFiles) throws AndroidNotCompatibleException { + // TODO Auto-generated method stub + + } + + @Override + protected void deletePackageInternal(String packageName) throws AndroidNotCompatibleException { try { mDeleteMethod.invoke(mPm, new Object[] { packageName, mDeleteObserver, 0 @@ -464,9 +470,4 @@ public class SystemPermissionInstaller extends Installer { */ public static final int DELETE_FAILED_USER_RESTRICTED = -3; - @Override - protected void installPackageInternal(List apkFiles) throws AndroidNotCompatibleException { - // TODO Auto-generated method stub - - } }