From e8d3a7a4ef781b814b0ece270647e36090c358a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Wed, 1 Jan 2014 22:22:21 +0100
Subject: [PATCH] Raise minSdk to 5, UIL requires it

---
 AndroidManifest.xml               |  2 +-
 src/org/fdroid/fdroid/DB.java     | 36 ++++++-------------------------
 src/org/fdroid/fdroid/FDroid.java |  4 ++--
 3 files changed, 9 insertions(+), 33 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index fde2acbde..455dc98d8 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -6,7 +6,7 @@
     android:versionName="@string/version_name" >
 
     <uses-sdk
-        android:minSdkVersion="4"
+        android:minSdkVersion="5"
         android:targetSdkVersion="19" />
 
     <supports-screens
diff --git a/src/org/fdroid/fdroid/DB.java b/src/org/fdroid/fdroid/DB.java
index 077ef948a..2c5e8cbaf 100644
--- a/src/org/fdroid/fdroid/DB.java
+++ b/src/org/fdroid/fdroid/DB.java
@@ -348,38 +348,14 @@ public class DB {
 
         // Call isCompatible(apk) on an instance of this class to
         // check if an APK is compatible with the user's device.
-        public static abstract class CompatibilityChecker extends Compatibility {
-
-            public abstract boolean isCompatible(Apk apk);
-
-            public static CompatibilityChecker getChecker(Context ctx) {
-                CompatibilityChecker checker;
-                if (hasApi(5))
-                    checker = new EclairChecker(ctx);
-                else
-                    checker = new BasicChecker();
-                Log.d("FDroid", "Compatibility checker for API level "
-                        + getApi() + ": " + checker.getClass().getName());
-                return checker;
-            }
-        }
-
-        private static class BasicChecker extends CompatibilityChecker {
-            @Override
-            public boolean isCompatible(Apk apk) {
-                return hasApi(apk.minSdkVersion);
-            }
-        }
-
-        @TargetApi(5)
-        private static class EclairChecker extends CompatibilityChecker {
+        private static class CompatibilityChecker extends Compatibility {
 
             private HashSet<String> features;
             private List<String> cpuAbis;
             private boolean ignoreTouchscreen;
 
-            @SuppressLint("NewApi")
-            public EclairChecker(Context ctx) {
+            //@SuppressLint("NewApi")
+            public CompatibilityChecker(Context ctx) {
 
                 SharedPreferences prefs = PreferenceManager
                         .getDefaultSharedPreferences(ctx);
@@ -416,7 +392,6 @@ public class DB {
                 return false;
             }
 
-            @Override
             public boolean isCompatible(Apk apk) {
                 if (!hasApi(apk.minSdkVersion))
                     return false;
@@ -1181,8 +1156,9 @@ public class DB {
         }
 
         // Lazy initialise this...
-        if (compatChecker == null)
-            compatChecker = Apk.CompatibilityChecker.getChecker(mContext);
+        if (compatChecker == null) {
+            compatChecker = new Apk.CompatibilityChecker(mContext);
+        }
 
         // See if it's compatible (by which we mean if it has at least one
         // compatible apk)
diff --git a/src/org/fdroid/fdroid/FDroid.java b/src/org/fdroid/fdroid/FDroid.java
index 74a57bdae..11b46c555 100644
--- a/src/org/fdroid/fdroid/FDroid.java
+++ b/src/org/fdroid/fdroid/FDroid.java
@@ -272,10 +272,10 @@ public class FDroid extends FragmentActivity {
             if ((resultCode & PreferencesActivity.RESULT_RESTART) != 0) {
                 ((FDroidApp) getApplication()).reloadTheme();
                 final Intent intent = getIntent();
-                if (Build.VERSION.SDK_INT >= 5) overridePendingTransition(0, 0);
+                overridePendingTransition(0, 0);
                 intent.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
                 finish();
-                if (Build.VERSION.SDK_INT >= 5) overridePendingTransition(0, 0);
+                overridePendingTransition(0, 0);
                 startActivity(intent);
             }