From d250ac727bd2c24bf9fa9ba8cd6a3c6b9cb5cef3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Sun, 11 May 2014 00:36:54 +0200 Subject: [PATCH] Cleanup installer code --- .../fdroid/fdroid/installer/DefaultInstaller.java | 12 ------------ src/org/fdroid/fdroid/installer/RootInstaller.java | 12 +++--------- 2 files changed, 3 insertions(+), 21 deletions(-) diff --git a/src/org/fdroid/fdroid/installer/DefaultInstaller.java b/src/org/fdroid/fdroid/installer/DefaultInstaller.java index e9ae33ca0..c43d15cae 100644 --- a/src/org/fdroid/fdroid/installer/DefaultInstaller.java +++ b/src/org/fdroid/fdroid/installer/DefaultInstaller.java @@ -48,18 +48,6 @@ public class DefaultInstaller extends Installer { private static final int REQUEST_CODE_INSTALL = 0; private static final int REQUEST_CODE_DELETE = 1; - // TODO: check before installation? - // int result = Settings.Secure.getInt(getContentResolver(), - // Settings.Secure.INSTALL_NON_MARKET_APPS, 0); - // if (result == 0) { - // // show some dialog here - // // ... - // // and may be show application settings dialog manually - // Intent intent = new Intent(); - // intent.setAction(Settings.ACTION_APPLICATION_SETTINGS); - // startActivity(intent); - // } - @Override public void installPackage(File apkFile) throws AndroidNotCompatibleException { super.installPackage(apkFile); diff --git a/src/org/fdroid/fdroid/installer/RootInstaller.java b/src/org/fdroid/fdroid/installer/RootInstaller.java index 67e10aa0a..cea4858b3 100644 --- a/src/org/fdroid/fdroid/installer/RootInstaller.java +++ b/src/org/fdroid/fdroid/installer/RootInstaller.java @@ -62,10 +62,8 @@ public class RootInstaller extends Installer { @Override public void onCommandResult(int commandCode, int exitCode, List output) { if (exitCode != Shell.OnCommandResultListener.SHELL_RUNNING) { - // TODO - // wrong uid + // NOTE: Additional exit codes: // Shell.OnCommandResultListener.SHELL_WRONG_UID - // exec failed // Shell.OnCommandResultListener.SHELL_EXEC_FAILED Log.e(TAG, "Error opening root shell with exitCode " + exitCode); @@ -89,10 +87,8 @@ public class RootInstaller extends Installer { @Override public void onCommandResult(int commandCode, int exitCode, List output) { if (exitCode != Shell.OnCommandResultListener.SHELL_RUNNING) { - // TODO - // wrong uid + // NOTE: Additional exit codes: // Shell.OnCommandResultListener.SHELL_WRONG_UID - // exec failed // Shell.OnCommandResultListener.SHELL_EXEC_FAILED Log.e(TAG, "Error opening root shell with exitCode " + exitCode); @@ -116,10 +112,8 @@ public class RootInstaller extends Installer { @Override public void onCommandResult(int commandCode, int exitCode, List output) { if (exitCode != Shell.OnCommandResultListener.SHELL_RUNNING) { - // TODO - // wrong uid + // NOTE: Additional exit codes: // Shell.OnCommandResultListener.SHELL_WRONG_UID - // exec failed // Shell.OnCommandResultListener.SHELL_EXEC_FAILED Log.e(TAG, "Error opening root shell with exitCode " + exitCode);