From 62a4d587564f01a759e91bfb6eff5db114bf4a85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 20 May 2015 17:42:11 +0200
Subject: [PATCH] Use right theme in InstallConfirmActivity, cleanup

---
 F-Droid/AndroidManifest.xml                                    | 2 +-
 .../org/fdroid/fdroid/installer/AppSecurityPermissions.java    | 2 +-
 .../org/fdroid/fdroid/installer/InstallConfirmActivity.java    | 3 +++
 F-Droid/src/org/fdroid/fdroid/installer/Installer.java         | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/F-Droid/AndroidManifest.xml b/F-Droid/AndroidManifest.xml
index 679b6d7af..fc914a74d 100644
--- a/F-Droid/AndroidManifest.xml
+++ b/F-Droid/AndroidManifest.xml
@@ -294,7 +294,7 @@
         </activity>
         <activity
             android:name=".installer.InstallConfirmActivity"
-            android:label=""
+            android:label="@string/menu_install"
             android:parentActivityName=".FDroid">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
diff --git a/F-Droid/src/org/fdroid/fdroid/installer/AppSecurityPermissions.java b/F-Droid/src/org/fdroid/fdroid/installer/AppSecurityPermissions.java
index c11192dc4..18e9e3f27 100644
--- a/F-Droid/src/org/fdroid/fdroid/installer/AppSecurityPermissions.java
+++ b/F-Droid/src/org/fdroid/fdroid/installer/AppSecurityPermissions.java
@@ -421,7 +421,7 @@ public class AppSecurityPermissions {
 
     private boolean isDisplayablePermission(PermissionInfo pInfo, int newReqFlags,
             int existingReqFlags) {
-        final int base = pInfo.protectionLevel & PermissionInfo.PROTECTION_MASK_BASE;
+        final int base = pInfo.protectionLevel&PermissionInfo.PROTECTION_MASK_BASE;
         final boolean isNormal = (base == PermissionInfo.PROTECTION_NORMAL);
         final boolean isDangerous = (base == PermissionInfo.PROTECTION_DANGEROUS);
         final boolean isRequired =
diff --git a/F-Droid/src/org/fdroid/fdroid/installer/InstallConfirmActivity.java b/F-Droid/src/org/fdroid/fdroid/installer/InstallConfirmActivity.java
index 87f3adff6..a60e3e1e9 100644
--- a/F-Droid/src/org/fdroid/fdroid/installer/InstallConfirmActivity.java
+++ b/F-Droid/src/org/fdroid/fdroid/installer/InstallConfirmActivity.java
@@ -39,6 +39,7 @@ import android.widget.ImageView;
 import android.widget.TabHost;
 import android.widget.TextView;
 
+import org.fdroid.fdroid.FDroidApp;
 import org.fdroid.fdroid.R;
 
 public class InstallConfirmActivity extends Activity implements OnCancelListener, OnClickListener {
@@ -208,6 +209,8 @@ public class InstallConfirmActivity extends Activity implements OnCancelListener
     protected void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
+        ((FDroidApp) getApplication()).applyTheme(this);
+
         mPm = getPackageManager();
 
         intent = getIntent();
diff --git a/F-Droid/src/org/fdroid/fdroid/installer/Installer.java b/F-Droid/src/org/fdroid/fdroid/installer/Installer.java
index b1610cef3..f20c07279 100644
--- a/F-Droid/src/org/fdroid/fdroid/installer/Installer.java
+++ b/F-Droid/src/org/fdroid/fdroid/installer/Installer.java
@@ -115,7 +115,7 @@ abstract public class Installer {
             }
         }
 
-        // Fallback -> DefaultInstaller
+        // else -> DefaultInstaller
         if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
             // Default installer on Android >= 4.0
             try {