Use reflection to invoke compatibility method

On some devices (e.g., G1 running Android 1.6), the verifier
will try to load every referenced class. This change prevents
the application from depending on AndroidLevel8. See issue #574.

2 files changed, 45 insertions, 13 deletions

diff --git a/main/src/cgeo/geocaching/compatibility/AndroidLevel8.java b/main/src/cgeo/geocaching/compatibility/AndroidLevel8.java
index dbf1a60..4b7fd62 100644
--- a/main/src/cgeo/geocaching/compatibility/AndroidLevel8.java
+++ b/main/src/cgeo/geocaching/compatibility/AndroidLevel8.java
@@ -1,19 +1,21 @@
 package cgeo.geocaching.compatibility;
 
+import cgeo.geocaching.cgSettings;
+
 import android.app.Activity;
 import android.app.backup.BackupManager;
+import android.util.Log;
 import android.view.Display;
 
 public class AndroidLevel8 {
 
-    @SuppressWarnings("static-method")
-    public int getRotation(final Activity activity) {
+    static public int getRotation(final Activity activity) {
         Display display = activity.getWindowManager().getDefaultDisplay();
         return display.getRotation();
     }
 
-    @SuppressWarnings("static-method")
-    public void dataChanged(final String name) {
+    static public void dataChanged(final String name) {
+        Log.i(cgSettings.tag, "Requesting settings backup with settings manager");
         BackupManager.dataChanged(name);
     }
 }
diff --git a/main/src/cgeo/geocaching/compatibility/Compatibility.java b/main/src/cgeo/geocaching/compatibility/Compatibility.java
index cbbfb15..72aa4c8 100644
--- a/main/src/cgeo/geocaching/compatibility/Compatibility.java
+++ b/main/src/cgeo/geocaching/compatibility/Compatibility.java
@@ -1,28 +1,53 @@
 package cgeo.geocaching.compatibility;
 
+import cgeo.geocaching.cgSettings;
+
 import android.app.Activity;
 import android.content.res.Configuration;
 import android.net.Uri;
 import android.os.Build;
+import android.util.Log;
 import android.view.Display;
 import android.view.Surface;
 
+import java.lang.reflect.Method;
+
 public final class Compatibility {
 
     private final static int sdkVersion = Integer.parseInt(Build.VERSION.SDK);
     private final static boolean isLevel8 = sdkVersion >= 8;
-    private final static AndroidLevel8 level8 = isLevel8 ? new AndroidLevel8() : null;
+
+    private static Method dataChangedMethod = null;
+    private static Method getRotationMethod = null;
+
+    static {
+        if (isLevel8) {
+            try {
+                final Class<?> cl = Class.forName("cgeo.geocaching.compatibility.AndroidLevel8");
+                dataChangedMethod = cl.getDeclaredMethod("dataChanged", String.class);
+                getRotationMethod = cl.getDeclaredMethod("getRotation", Activity.class);
+            } catch (final Exception e) {
+                // Exception can be ClassNotFoundException, SecurityException or NoSuchMethodException
+                Log.e(cgSettings.tag, "Cannot load AndroidLevel8 class", e);
+            }
+        }
+    }
 
     public static Float getDirectionNow(final Float directionNowPre,
             final Activity activity) {
         if (isLevel8) {
-            final int rotation = level8.getRotation(activity);
-            if (rotation == Surface.ROTATION_90) {
-                return directionNowPre + 90;
-            } else if (rotation == Surface.ROTATION_180) {
-                return directionNowPre + 180;
-            } else if (rotation == Surface.ROTATION_270) {
-                return directionNowPre + 270;
+            try {
+                final int rotation = (Integer) getRotationMethod.invoke(null, activity);
+                if (rotation == Surface.ROTATION_90) {
+                    return directionNowPre + 90;
+                } else if (rotation == Surface.ROTATION_180) {
+                    return directionNowPre + 180;
+                } else if (rotation == Surface.ROTATION_270) {
+                    return directionNowPre + 270;
+                }
+            } catch (final Exception e) {
+                // This should never happen: IllegalArgumentException, IllegalAccessException or InvocationTargetException
+                Log.e(cgSettings.tag, "Cannot call getRotation()", e);
             }
         } else {
             final Display display = activity.getWindowManager()
@@ -45,7 +70,12 @@ public final class Compatibility {
 
     public static void dataChanged(final String name) {
         if (isLevel8) {
-            level8.dataChanged(name);
+            try {
+                dataChangedMethod.invoke(null, name);
+            } catch (final Exception e) {
+                // This should never happen: IllegalArgumentException, IllegalAccessException or InvocationTargetException
+                Log.e(cgSettings.tag, "Cannot call dataChanged()", e);
+            }
         }
     }