Remove compatibility with API < 5

4 files changed, 23 insertions, 52 deletions

diff --git a/main/src/cgeo/geocaching/activity/AbstractActivity.java b/main/src/cgeo/geocaching/activity/AbstractActivity.java
index fd83043..1ed9b9b 100644
--- a/main/src/cgeo/geocaching/activity/AbstractActivity.java
+++ b/main/src/cgeo/geocaching/activity/AbstractActivity.java
@@ -4,10 +4,10 @@ import butterknife.ButterKnife;
 
 import cgeo.geocaching.CgeoApplication;
 import cgeo.geocaching.R;
-import cgeo.geocaching.compatibility.Compatibility;
 import cgeo.geocaching.network.Cookies;
 import cgeo.geocaching.settings.Settings;
 import cgeo.geocaching.utils.ClipboardUtils;
+import cgeo.geocaching.utils.EditUtils;
 import cgeo.geocaching.utils.HtmlUtils;
 import cgeo.geocaching.utils.TranslationUtils;
 
@@ -86,11 +86,16 @@ public abstract class AbstractActivity extends FragmentActivity implements IAbst
     }
 
     protected static void disableSuggestions(final EditText edit) {
-        Compatibility.disableSuggestions(edit);
+        EditUtils.disableSuggestions(edit);
     }
 
     protected void restartActivity() {
-        Compatibility.restartActivity(this);
+        final Intent intent = getIntent();
+        overridePendingTransition(0, 0);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
+        finish();
+        overridePendingTransition(0, 0);
+        startActivity(intent);
     }
 
     @Override
diff --git a/main/src/cgeo/geocaching/compatibility/Compatibility.java b/main/src/cgeo/geocaching/compatibility/Compatibility.java
index 31c9e31..8fbc110 100644
--- a/main/src/cgeo/geocaching/compatibility/Compatibility.java
+++ b/main/src/cgeo/geocaching/compatibility/Compatibility.java
@@ -1,18 +1,12 @@
 package cgeo.geocaching.compatibility;
 
-import cgeo.geocaching.activity.AbstractActivity;
 import cgeo.geocaching.utils.AngleUtils;
-import cgeo.geocaching.utils.Log;
 
-import org.apache.commons.lang3.reflect.MethodUtils;
 import org.eclipse.jdt.annotation.NonNull;
 
 import android.app.Activity;
-import android.content.Intent;
 import android.graphics.Point;
 import android.os.Build;
-import android.text.InputType;
-import android.widget.EditText;
 
 import java.io.File;
 
@@ -20,7 +14,6 @@ public final class Compatibility {
 
     private final static int sdkVersion = Build.VERSION.SDK_INT;
     private final static boolean isLevel8 = sdkVersion >= 8;
-    private final static boolean isLevel5 = sdkVersion >= 5;
 
     private final static AndroidLevel8Interface level8;
     private final static AndroidLevel11Interface level11;
@@ -51,39 +44,6 @@ public final class Compatibility {
         level8.dataChanged(name);
     }
 
-    public static void disableSuggestions(EditText edit) {
-        if (isLevel5) {
-            edit.setInputType(edit.getInputType()
-                    | InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS
-                    | InputType.TYPE_TEXT_VARIATION_FILTER);
-        }
-        else {
-            edit.setInputType(edit.getInputType()
-                    | InputType.TYPE_TEXT_VARIATION_FILTER);
-        }
-    }
-
-    private static void overridePendingTransition(final Activity activity, int enterAnim, int exitAnim) {
-        try {
-            MethodUtils.invokeMethod(activity, "overridePendingTransition", enterAnim, exitAnim);
-        } catch (Exception e) {
-            Log.e("cannot call overridePendingTransition", e);
-        }
-    }
-
-    public static void restartActivity(AbstractActivity activity) {
-        final Intent intent = activity.getIntent();
-        if (isLevel5) {
-            overridePendingTransition(activity, 0, 0);
-            intent.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
-        }
-        activity.finish();
-        if (isLevel5) {
-            overridePendingTransition(activity, 0, 0);
-        }
-        activity.startActivity(intent);
-    }
-
     public static void invalidateOptionsMenu(final Activity activity) {
         level11.invalidateOptionsMenu(activity);
     }
diff --git a/main/src/cgeo/geocaching/ui/dialog/CoordinatesInputDialog.java b/main/src/cgeo/geocaching/ui/dialog/CoordinatesInputDialog.java
index c150434..cb52319 100644
--- a/main/src/cgeo/geocaching/ui/dialog/CoordinatesInputDialog.java
+++ b/main/src/cgeo/geocaching/ui/dialog/CoordinatesInputDialog.java
@@ -5,11 +5,11 @@ import cgeo.geocaching.sensors.IGeoData;
 import cgeo.geocaching.R;
 import cgeo.geocaching.activity.AbstractActivity;
 import cgeo.geocaching.activity.ActivityMixin;
-import cgeo.geocaching.compatibility.Compatibility;
 import cgeo.geocaching.geopoint.Geopoint;
 import cgeo.geocaching.geopoint.GeopointFormatter;
 import cgeo.geocaching.settings.Settings;
 import cgeo.geocaching.settings.Settings.CoordInputFormatEnum;
+import cgeo.geocaching.utils.EditUtils;
 
 import org.apache.commons.lang3.StringUtils;
 
@@ -103,14 +103,14 @@ public class CoordinatesInputDialog extends NoTitleDialog {
         eLonSec.addTextChangedListener(new TextChanged(eLonSec));
         eLonSub.addTextChangedListener(new TextChanged(eLonSub));
 
-        Compatibility.disableSuggestions(eLatDeg);
-        Compatibility.disableSuggestions(eLatMin);
-        Compatibility.disableSuggestions(eLatSec);
-        Compatibility.disableSuggestions(eLatSub);
-        Compatibility.disableSuggestions(eLonDeg);
-        Compatibility.disableSuggestions(eLonMin);
-        Compatibility.disableSuggestions(eLonSec);
-        Compatibility.disableSuggestions(eLonSub);
+        EditUtils.disableSuggestions(eLatDeg);
+        EditUtils.disableSuggestions(eLatMin);
+        EditUtils.disableSuggestions(eLatSec);
+        EditUtils.disableSuggestions(eLatSub);
+        EditUtils.disableSuggestions(eLonDeg);
+        EditUtils.disableSuggestions(eLonMin);
+        EditUtils.disableSuggestions(eLonSec);
+        EditUtils.disableSuggestions(eLonSub);
 
         bLat.setOnClickListener(new ButtonClickListener());
         bLon.setOnClickListener(new ButtonClickListener());
diff --git a/main/src/cgeo/geocaching/utils/EditUtils.java b/main/src/cgeo/geocaching/utils/EditUtils.java
index d975df9..0bfe2ea 100644
--- a/main/src/cgeo/geocaching/utils/EditUtils.java
+++ b/main/src/cgeo/geocaching/utils/EditUtils.java
@@ -1,5 +1,6 @@
 package cgeo.geocaching.utils;
 
+import android.text.InputType;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.inputmethod.EditorInfo;
@@ -41,4 +42,9 @@ public final class EditUtils {
 
     }
 
+    public static void disableSuggestions(EditText edit) {
+        edit.setInputType(edit.getInputType()
+                | InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS
+                | InputType.TYPE_TEXT_VARIATION_FILTER);
+    }
 }