From 54ce7a07a6aecdcc174b0e32c561527f7d5e95a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Mon, 12 May 2014 11:31:25 +0200
Subject: [PATCH] Cleanup for getActivityInstaller

---
 .../fdroid/fdroid/installer/Installer.java    | 32 +++++++++----------
 .../fdroid/installer/RootInstaller.java       |  2 +-
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/org/fdroid/fdroid/installer/Installer.java b/src/org/fdroid/fdroid/installer/Installer.java
index d09b88380..76ec90003 100644
--- a/src/org/fdroid/fdroid/installer/Installer.java
+++ b/src/org/fdroid/fdroid/installer/Installer.java
@@ -109,6 +109,8 @@ abstract public class Installer {
         // if root installer has been activated in preferences -> RootInstaller
         boolean useRootInstaller = Preferences.get().useRootInstaller();
         if (useRootInstaller) {
+            Log.d(TAG, "root installer preference enabled -> RootInstaller");
+
             try {
                 return new RootInstaller(activity, pm, callback);
             } catch (AndroidNotCompatibleException e) {
@@ -127,28 +129,25 @@ abstract public class Installer {
             }
         }
 
-        // Android >= 4.0
+        // Fallback -> DefaultInstaller
         if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
+            // Default installer on Android >= 4.0
             try {
-                Log.d(TAG, "try default installer for Android 4");
+                Log.d(TAG, "try default installer for Android >= 4");
 
                 return new DefaultInstallerSdk14(activity, pm, callback);
             } catch (AndroidNotCompatibleException e) {
-                Log.e(TAG,
-                        "Android not compatible with DefaultInstallerSdk14! This should really not happen!",
-                        e);
+                Log.e(TAG, "Android not compatible with DefaultInstallerSdk14!", e);
             }
-        }
+        } else {
+            // Default installer on Android < 4.0
+            try {
+                Log.d(TAG, "try default installer for Android < 4");
 
-        // Fallback -> DefaultInstaller
-        try {
-            Log.d(TAG, "try default installer");
-
-            return new DefaultInstaller(activity, pm, callback);
-        } catch (AndroidNotCompatibleException e) {
-            Log.e(TAG,
-                    "Android not compatible with DefaultInstaller! This should really not happen!",
-                    e);
+                return new DefaultInstaller(activity, pm, callback);
+            } catch (AndroidNotCompatibleException e) {
+                Log.e(TAG, "Android not compatible with DefaultInstaller!", e);
+            }
         }
 
         // this should not happen!
@@ -182,7 +181,8 @@ abstract public class Installer {
                 pm.checkPermission(permission.INSTALL_PACKAGES, context.getPackageName());
         int checkDeletePermission =
                 pm.checkPermission(permission.DELETE_PACKAGES, context.getPackageName());
-        boolean permissionsGranted = (checkInstallPermission == PackageManager.PERMISSION_GRANTED
+        boolean permissionsGranted =
+                (checkInstallPermission == PackageManager.PERMISSION_GRANTED
                 && checkDeletePermission == PackageManager.PERMISSION_GRANTED);
 
         if (permissionsGranted) {
diff --git a/src/org/fdroid/fdroid/installer/RootInstaller.java b/src/org/fdroid/fdroid/installer/RootInstaller.java
index d6d4079d7..ca6fb683b 100644
--- a/src/org/fdroid/fdroid/installer/RootInstaller.java
+++ b/src/org/fdroid/fdroid/installer/RootInstaller.java
@@ -205,7 +205,7 @@ public class RootInstaller extends Installer {
      * <p/>
      * Options:<br/>
      * -l: install the package with FORWARD_LOCK.<br/>
-     * -r: reinstall an exisiting app, keeping its data.<br/>
+     * -r: reinstall an existing app, keeping its data.<br/>
      * -t: allow test .apks to be installed.<br/>
      * -i: specify the installer package name.<br/>
      * -s: install package on sdcard.<br/>