From 17f712870bed7c04df7af271bd21a58c5b63af96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Sun, 1 May 2016 23:10:41 +0200
Subject: [PATCH 1/3] Fix crash of transparent dialogs on Android 6

---
 app/src/main/AndroidManifest.xml       | 4 ++--
 app/src/main/res/values-v23/styles.xml | 7 +++++++
 app/src/main/res/values/styles.xml     | 2 ++
 3 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/res/values-v23/styles.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0f2e2e03e..38eff6a2c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -393,10 +393,10 @@
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".FDroid" />
         </activity>
-        <!-- Note: Theme.NoDisplay, this activity shows dialogs only -->
+        <!-- Note: AppThemeTransparent, this activity shows dialogs only -->
         <activity
             android:name=".privileged.install.InstallExtensionDialogActivity"
-            android:theme="@android:style/Theme.NoDisplay" />
+            android:theme="@style/AppThemeTransparent" />
         <receiver
             android:name=".privileged.install.InstallExtensionBootReceiver" >
             <intent-filter>
diff --git a/app/src/main/res/values-v23/styles.xml b/app/src/main/res/values-v23/styles.xml
new file mode 100644
index 000000000..628ad2432
--- /dev/null
+++ b/app/src/main/res/values-v23/styles.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- see http://stackoverflow.com/questions/32169303/activity-did-not-call-finish-api-23 -->
+    <style name="AppThemeTransparent" parent="@android:style/Theme.Translucent.NoTitleBar" />
+
+</resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 397e2581e..254dbe092 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -237,4 +237,6 @@
     </style>
 
     <style name="AppDetailsSubheaderText" parent="AppDetailsSubheaderTextBase" />
+
+    <style name="AppThemeTransparent" parent="@android:style/Theme.NoDisplay" />
 </resources>

From 834c08db3c3b2ec31dcc2ba3fca56a429457ddc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Sun, 1 May 2016 23:14:29 +0200
Subject: [PATCH 2/3] Code cleanup in Installer

---
 .../main/java/org/fdroid/fdroid/installer/Installer.java   | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/org/fdroid/fdroid/installer/Installer.java b/app/src/main/java/org/fdroid/fdroid/installer/Installer.java
index bd85b71f0..815384314 100644
--- a/app/src/main/java/org/fdroid/fdroid/installer/Installer.java
+++ b/app/src/main/java/org/fdroid/fdroid/installer/Installer.java
@@ -162,10 +162,7 @@ public abstract class Installer {
             return false;
         }
         Hasher hasher = new Hasher(hashType, apkFile);
-        if (hasher != null && hasher.match(hash)) {
-            return true;
-        }
-        return false;
+        return hasher.match(hash);
     }
 
     /**
@@ -173,7 +170,7 @@ public abstract class Installer {
      */
     public void installPackage(File apkFile, String packageName, String urlString)
             throws InstallFailedException {
-        SanitizedFile apkToInstall = null;
+        SanitizedFile apkToInstall;
         try {
             Map<String, Object> attributes = AndroidXMLDecompress.getManifestHeaderAttributes(apkFile.getAbsolutePath());
 

From cf694b6d830debff4bc31a7c24f0759abb7c34e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Sun, 1 May 2016 23:15:41 +0200
Subject: [PATCH 3/3] Disable install of privileged ext on Android 5.1

---
 .../install/InstallExtensionDialogActivity.java   | 15 +++++++++++++++
 app/src/main/res/values/strings.xml               |  1 +
 2 files changed, 16 insertions(+)

diff --git a/app/src/main/java/org/fdroid/fdroid/privileged/install/InstallExtensionDialogActivity.java b/app/src/main/java/org/fdroid/fdroid/privileged/install/InstallExtensionDialogActivity.java
index 26bb0c299..d488a9a56 100644
--- a/app/src/main/java/org/fdroid/fdroid/privileged/install/InstallExtensionDialogActivity.java
+++ b/app/src/main/java/org/fdroid/fdroid/privileged/install/InstallExtensionDialogActivity.java
@@ -206,6 +206,21 @@ public class InstallExtensionDialogActivity extends FragmentActivity {
         // hack to get theme applied (which is not automatically applied due to activity's Theme.NoDisplay
         ContextThemeWrapper theme = new ContextThemeWrapper(this, FDroidApp.getCurThemeResId());
 
+        // not support on Android >= 5.1
+        if (android.os.Build.VERSION.SDK_INT >= 22) {
+            AlertDialog.Builder alertBuilder = new AlertDialog.Builder(theme);
+            alertBuilder.setMessage(R.string.system_install_not_supported);
+            alertBuilder.setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
+                @Override
+                public void onClick(DialogInterface dialog, int which) {
+                    InstallExtensionDialogActivity.this.setResult(Activity.RESULT_CANCELED);
+                    InstallExtensionDialogActivity.this.finish();
+                }
+            });
+            alertBuilder.create().show();
+            return;
+        }
+
         AlertDialog.Builder alertBuilder = new AlertDialog.Builder(theme);
         alertBuilder.setTitle(R.string.system_install_question);
         String message = InstallExtension.create(getApplicationContext()).getWarningString();
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 074fd531d..24dac9ce0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -295,6 +295,7 @@
     <string name="system_install_first_time_message">Looks like you have root access on your device. You can now install F-Droid Privileged Extension, tightly coupled with the Android operating system. This allows F-Droid to install, upgrade and uninstall apps on its own.</string>
     <string name="system_uninstall">Do you want to uninstall F-Droid Privileged Extension?</string>
     <string name="system_uninstall_button">Uninstall</string>
+    <string name="system_install_not_supported">Installation of F-Droid Privileged Extension is currently not supported on Android 5.1 or later.</string>
 
     <string name="swap_nfc_title">Touch to swap</string>
     <string name="swap_nfc_description">If your friend has F-Droid and NFC turned on touch your devices together.</string>