From 14f04cdd8c2648e89ef4ea7995743794029a2490 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Fri, 7 Aug 2015 23:59:46 -0700
Subject: [PATCH 1/3] Re-add lightWithDarkActionBar enum item (fixes #340)

Added it in the same position as it was originally.
---
 F-Droid/src/org/fdroid/fdroid/FDroidApp.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/F-Droid/src/org/fdroid/fdroid/FDroidApp.java b/F-Droid/src/org/fdroid/fdroid/FDroidApp.java
index b6b05c35a..8dace0ceb 100644
--- a/F-Droid/src/org/fdroid/fdroid/FDroidApp.java
+++ b/F-Droid/src/org/fdroid/fdroid/FDroidApp.java
@@ -86,6 +86,7 @@ public class FDroidApp extends Application {
     public enum Theme {
         dark,
         light,
+        lightWithDarkActionBar, // Obsolete
     }
 
     private static Theme curTheme = Theme.light;

From 9183c523a598ab9d6c357f777abe9494876dc6e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Sat, 8 Aug 2015 00:02:38 -0700
Subject: [PATCH 2/3] Re-add superuser permission to manifest (fixes #339)

---
 F-Droid/AndroidManifest.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/F-Droid/AndroidManifest.xml b/F-Droid/AndroidManifest.xml
index 87f6c2e8d..b89c64e86 100644
--- a/F-Droid/AndroidManifest.xml
+++ b/F-Droid/AndroidManifest.xml
@@ -55,6 +55,11 @@
     <uses-permission android:name="android.permission.DELETE_PACKAGES"
         tools:ignore="ProtectedPermissions"/>
 
+    <!-- Indicate that F-Droid may request root access (introduced by Koush's Superuser app)
+         This permission is deprecated, but necessary for some old superuser
+         apps to actually grant superuser access to F-Droid. -->
+    <uses-permission android:name="android.permission.ACCESS_SUPERUSER"/>
+
     <application
         android:name="FDroidApp"
         android:icon="@drawable/ic_launcher"

From c609cc687716a1ebe9ac4b89e931f0ef67b66d9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Sat, 8 Aug 2015 00:06:41 -0700
Subject: [PATCH 3/3] Don't prompt users to install into system until it's
 stable

Right now there are multiple issues - #294, #346, #347, #348 - so telling
people to go through the process at startup should not happen yet.
---
 .../fdroid/installer/InstallIntoSystemDialogActivity.java     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/F-Droid/src/org/fdroid/fdroid/installer/InstallIntoSystemDialogActivity.java b/F-Droid/src/org/fdroid/fdroid/installer/InstallIntoSystemDialogActivity.java
index ded1cabb3..8fe2b102c 100644
--- a/F-Droid/src/org/fdroid/fdroid/installer/InstallIntoSystemDialogActivity.java
+++ b/F-Droid/src/org/fdroid/fdroid/installer/InstallIntoSystemDialogActivity.java
@@ -107,7 +107,9 @@ public class InstallIntoSystemDialogActivity extends FragmentActivity {
             protected void onPostExecute(Boolean probablyRoot) {
                 super.onPostExecute(probablyRoot);
 
-                if (probablyRoot) {
+                // TODO: remove false condition once the install into system
+                // process is stable - #294, #346, #347, #348
+                if (false && probablyRoot) {
                     // looks like we have root, at least su has a version number and is present
 
                     Intent installIntent = new Intent(context, InstallIntoSystemDialogActivity.class);