Remove unused getRotation from AndroidLevel8Interface

Also, there are only four values that can be returned by Android
getRotation().

3 files changed, 6 insertions, 26 deletions

diff --git a/main/src/cgeo/geocaching/compatibility/AndroidLevel8.java b/main/src/cgeo/geocaching/compatibility/AndroidLevel8.java
index e250934..1189ff5 100644
--- a/main/src/cgeo/geocaching/compatibility/AndroidLevel8.java
+++ b/main/src/cgeo/geocaching/compatibility/AndroidLevel8.java
@@ -6,7 +6,6 @@ import android.annotation.TargetApi;
 import android.app.Activity;
 import android.app.backup.BackupManager;
 import android.os.Environment;
-import android.view.Display;
 import android.view.Surface;
 
 import java.io.File;
@@ -15,12 +14,6 @@ import java.io.File;
 public class AndroidLevel8 implements AndroidLevel8Interface {
 
     @Override
-    public int getRotation(final Activity activity) {
-        Display display = activity.getWindowManager().getDefaultDisplay();
-        return display.getRotation();
-    }
-
-    @Override
     public void dataChanged(final String name) {
         Log.i("Requesting settings backup with settings manager");
         BackupManager.dataChanged(name);
@@ -28,21 +21,16 @@ public class AndroidLevel8 implements AndroidLevel8Interface {
 
     @Override
     public int getRotationOffset(final Activity activity) {
-        try {
-            final int rotation = getRotation(activity);
-            if (rotation == Surface.ROTATION_90) {
+        switch (activity.getWindowManager().getDefaultDisplay().getRotation()) {
+            case Surface.ROTATION_90:
                 return 90;
-            } else if (rotation == Surface.ROTATION_180) {
+            case Surface.ROTATION_180:
                 return 180;
-            } else if (rotation == Surface.ROTATION_270) {
+            case Surface.ROTATION_270:
                 return 270;
-            }
-        } catch (final Exception e) {
-            // This should never happen: IllegalArgumentException, IllegalAccessException or InvocationTargetException
-            Log.e("Cannot call getRotation()", e);
+            default:
+                return 0;
         }
-
-        return 0;
     }
 
     @Override
diff --git a/main/src/cgeo/geocaching/compatibility/AndroidLevel8Emulation.java b/main/src/cgeo/geocaching/compatibility/AndroidLevel8Emulation.java
index 996c527..a60b48d 100644
--- a/main/src/cgeo/geocaching/compatibility/AndroidLevel8Emulation.java
+++ b/main/src/cgeo/geocaching/compatibility/AndroidLevel8Emulation.java
@@ -12,11 +12,6 @@ import java.io.File;
 public class AndroidLevel8Emulation implements AndroidLevel8Interface {
 
     @Override
-    public int getRotation(final Activity activity) {
-        return 0;
-    }
-
-    @Override
     public void dataChanged(final String name) {
         // do nothing
     }
diff --git a/main/src/cgeo/geocaching/compatibility/AndroidLevel8Interface.java b/main/src/cgeo/geocaching/compatibility/AndroidLevel8Interface.java
index 75998aa..2ba3708 100644
--- a/main/src/cgeo/geocaching/compatibility/AndroidLevel8Interface.java
+++ b/main/src/cgeo/geocaching/compatibility/AndroidLevel8Interface.java
@@ -5,10 +5,7 @@ import android.app.Activity;
 import java.io.File;
 
 public interface AndroidLevel8Interface {
-    public int getRotation(final Activity activity);
     public void dataChanged(final String name);
-
     public int getRotationOffset(final Activity activity);
-
     public File getExternalPictureDir();
 }
\ No newline at end of file