refactoring: remove unused code

9 files changed, 10 insertions, 143 deletions

diff --git a/main/src/cgeo/geocaching/activity/ActivityMixin.java b/main/src/cgeo/geocaching/activity/ActivityMixin.java
index 699d5ab..9b1e433 100644
--- a/main/src/cgeo/geocaching/activity/ActivityMixin.java
+++ b/main/src/cgeo/geocaching/activity/ActivityMixin.java
@@ -2,8 +2,8 @@ package cgeo.geocaching.activity;
 
 import cgeo.geocaching.MainActivity;
 import cgeo.geocaching.R;
-import cgeo.geocaching.settings.Settings;
 import cgeo.geocaching.compatibility.Compatibility;
+import cgeo.geocaching.settings.Settings;
 
 import org.apache.commons.lang3.StringUtils;
 
@@ -63,14 +63,6 @@ public final class ActivityMixin {
         }
     }
 
-    public static int getTheme() {
-        if (Settings.isLightSkin()) {
-            return R.style.light;
-        }
-
-        return R.style.dark;
-    }
-
     public static int getDialogTheme() {
         // Light theme dialogs don't work on Android Api < 11
         if (Settings.isLightSkin() && Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
diff --git a/main/src/cgeo/geocaching/apps/cache/navi/NavigationAppFactory.java b/main/src/cgeo/geocaching/apps/cache/navi/NavigationAppFactory.java
index ce42e36..5074188 100644
--- a/main/src/cgeo/geocaching/apps/cache/navi/NavigationAppFactory.java
+++ b/main/src/cgeo/geocaching/apps/cache/navi/NavigationAppFactory.java
@@ -224,44 +224,6 @@ public final class NavigationAppFactory extends AbstractAppFactory {
     }
 
     /**
-     * This offset is used to build unique menu ids to avoid collisions of ids in menus
-     */
-    private static final int MENU_ITEM_OFFSET = 12345;
-
-
-    /**
-     * Adds the installed navigation tools to the given menu.
-     * Use {@link #onMenuItemSelected(MenuItem, Activity, cgeo.geocaching.Geocache)} on
-     * selection event to start the selected navigation tool.
-     *
-     * <b>Only use this way if {@link #showNavigationMenu(Activity, cgeo.geocaching.Geocache, cgeo.geocaching.Waypoint, Geopoint, boolean, boolean)} is
-     * not suitable for the given usecase.</b>
-     *
-     * @param menu
-     */
-    public static void addMenuItems(final Menu menu, final Geocache cache) {
-        for (final NavigationAppsEnum navApp : getInstalledNavigationApps()) {
-            if (navApp.app instanceof CacheNavigationApp) {
-                final CacheNavigationApp cacheApp = (CacheNavigationApp) navApp.app;
-                if (cacheApp.isEnabled(cache) && Settings.isUseNavigationApp(navApp)) {
-                    menu.add(0, MENU_ITEM_OFFSET + navApp.id, 0, navApp.app.getName());
-                }
-            }
-        }
-    }
-
-    public static void addMenuItems(final Menu menu, final Waypoint waypoint) {
-        for (final NavigationAppsEnum navApp : getInstalledNavigationApps()) {
-            if (navApp.app instanceof WaypointNavigationApp) {
-                final WaypointNavigationApp waypointApp = (WaypointNavigationApp) navApp.app;
-                if (waypointApp.isEnabled(waypoint) && Settings.isUseNavigationApp(navApp)) {
-                    menu.add(0, MENU_ITEM_OFFSET + navApp.id, 0, navApp.app.getName());
-                }
-            }
-        }
-    }
-
-    /**
      * Handles menu selections for menu entries created with {@link #addMenuItems(Menu, cgeo.geocaching.Geocache)}.
      *
      * @param item
@@ -306,7 +268,7 @@ public final class NavigationAppFactory extends AbstractAppFactory {
     private static App getAppFromMenuItem(MenuItem item) {
         final int id = item.getItemId();
         for (final NavigationAppsEnum navApp : NavigationAppsEnum.values()) {
-            if (MENU_ITEM_OFFSET + navApp.id == id) {
+            if (navApp.id == id) {
                 return navApp.app;
             }
         }
diff --git a/main/src/cgeo/geocaching/connector/gc/Tile.java b/main/src/cgeo/geocaching/connector/gc/Tile.java
index 4ed53c9..623730a 100644
--- a/main/src/cgeo/geocaching/connector/gc/Tile.java
+++ b/main/src/cgeo/geocaching/connector/gc/Tile.java
@@ -29,11 +29,6 @@ import java.util.Set;
  */
 public class Tile {
 
-    public static final double LATITUDE_MIN = -85.05112878;
-    public static final double LATITUDE_MAX = 85.05112878;
-    public static final double LONGITUDE_MIN = -180;
-    public static final double LONGITUDE_MAX = 180;
-
     public static final int TILE_SIZE = 256;
     public static final int ZOOMLEVEL_MAX = 18;
     public static final int ZOOMLEVEL_MIN = 0;
diff --git a/main/src/cgeo/geocaching/connector/gc/UTFGrid.java b/main/src/cgeo/geocaching/connector/gc/UTFGrid.java
index 6d20eb6..89a3de8 100644
--- a/main/src/cgeo/geocaching/connector/gc/UTFGrid.java
+++ b/main/src/cgeo/geocaching/connector/gc/UTFGrid.java
@@ -12,22 +12,6 @@ public final class UTFGrid {
     public static final int GRID_MAXX = 63;
     public static final int GRID_MAXY = 63;
 
-    /**
-     * Convert a value from a JSON grid object into an id that can be used as an index
-     * It's not used at the moment due to optimizations.
-     * But maybe we need it some day...
-     */
-    public static short getUTFGridId(final char value) {
-        short result = (short) value;
-        if (result >= 93) {
-            result--;
-        }
-        if (result >= 35) {
-            result--;
-        }
-        return (short) (result - 32);
-    }
-
     /** Calculate from a list of positions (x/y) the coords */
     public static UTFGridPosition getPositionInGrid(List<UTFGridPosition> positions) {
         int minX = GRID_MAXX;
diff --git a/main/src/cgeo/geocaching/geopoint/Geopoint.java b/main/src/cgeo/geocaching/geopoint/Geopoint.java
index 547ad29..f21df01 100644
--- a/main/src/cgeo/geocaching/geopoint/Geopoint.java
+++ b/main/src/cgeo/geocaching/geopoint/Geopoint.java
@@ -300,7 +300,7 @@ public final class Geopoint implements ICoordinates, Parcelable {
     /**
      * Returns formatted coordinates with default format.
      * Default format is decimalminutes, e.g. N 52° 36.123 E 010° 03.456
-     *
+     * 
      * @return formatted coordinates
      */
     @Override
@@ -364,8 +364,8 @@ public final class Geopoint implements ICoordinates, Parcelable {
     }
 
     /**
-     * Get longitude chararcter (E or W).
-     *
+     * Get longitude character (E or W).
+     * 
      * @return
      */
     public char getLonDir() {
diff --git a/main/src/cgeo/geocaching/maps/AbstractItemizedOverlay.java b/main/src/cgeo/geocaching/maps/AbstractItemizedOverlay.java
index 464c2b2..747618b 100644
--- a/main/src/cgeo/geocaching/maps/AbstractItemizedOverlay.java
+++ b/main/src/cgeo/geocaching/maps/AbstractItemizedOverlay.java
@@ -31,10 +31,6 @@ public abstract class AbstractItemizedOverlay implements GeneralOverlay {
         return ovlImpl.superOnTap(index);
     }
 
-    Drawable boundCenter(Drawable markerIn) {
-        return ovlImpl.superBoundCenter(markerIn);
-    }
-
     Drawable boundCenterBottom(Drawable markerIn) {
         return ovlImpl.superBoundCenterBottom(markerIn);
     }
diff --git a/main/src/cgeo/geocaching/network/OAuthAuthorizationActivity.java b/main/src/cgeo/geocaching/network/OAuthAuthorizationActivity.java
index 8a1002c..888cf77 100644
--- a/main/src/cgeo/geocaching/network/OAuthAuthorizationActivity.java
+++ b/main/src/cgeo/geocaching/network/OAuthAuthorizationActivity.java
@@ -321,8 +321,4 @@ public abstract class OAuthAuthorizationActivity extends AbstractActivity {
     protected String getAuthAuthorize() {
         return res.getString(R.string.auth_authorize, getAuthTitle());
     }
-
-    protected String getAuthFinish() {
-        return res.getString(R.string.auth_finish, getAuthTitle());
-    }
 }
diff --git a/main/src/cgeo/geocaching/settings/Settings.java b/main/src/cgeo/geocaching/settings/Settings.java
index 442df2d..4059ece 100644
--- a/main/src/cgeo/geocaching/settings/Settings.java
+++ b/main/src/cgeo/geocaching/settings/Settings.java
@@ -42,7 +42,7 @@ import java.util.Locale;
 /**
  * General c:geo preferences/settings set by the user
  */
-public final class Settings {
+public class Settings {
 
     public static final int SHOW_WP_THRESHOLD_DEFAULT = 10;
     public static final int SHOW_WP_THRESHOLD_MAX = 50;
@@ -82,8 +82,8 @@ public final class Settings {
      */
     private static MapSource mapSource;
 
-    private Settings() {
-        // this class is not to be instantiated;
+    protected Settings() {
+        throw new InstantiationError();
     }
 
     private static void migrateSettings() {
@@ -215,13 +215,13 @@ public final class Settings {
         return sharedPrefs.getFloat(getKey(prefKeyId), defaultValue);
     }
 
-    static boolean putString(final int prefKeyId, final String value) {
+    protected static boolean putString(final int prefKeyId, final String value) {
         final SharedPreferences.Editor edit = sharedPrefs.edit();
         edit.putString(getKey(prefKeyId), value);
         return edit.commit();
     }
 
-    private static boolean putBoolean(final int prefKeyId, final boolean value) {
+    protected static boolean putBoolean(final int prefKeyId, final boolean value) {
         final SharedPreferences.Editor edit = sharedPrefs.edit();
         edit.putBoolean(getKey(prefKeyId), value);
         return edit.commit();
@@ -450,10 +450,6 @@ public final class Settings {
         putInt(R.string.pref_coordinputformat, format.ordinal());
     }
 
-    static void setLogOffline(final boolean offline) {
-        putBoolean(R.string.pref_log_offline, offline);
-    }
-
     public static boolean getLogOffline() {
         return getBoolean(R.string.pref_log_offline, false);
     }
@@ -482,11 +478,6 @@ public final class Settings {
         return getBoolean(R.string.pref_excludemine, false);
     }
 
-    public static void setUseEnglish(final boolean english) {
-        putBoolean(R.string.pref_useenglish, english);
-        setLanguage(english);
-    }
-
     public static boolean isUseEnglish() {
         return getBoolean(R.string.pref_useenglish, false);
     }
@@ -797,22 +788,12 @@ public final class Settings {
                 String.valueOf(NavigationAppsEnum.COMPASS.id)));
     }
 
-    public static void setDefaultNavigationTool(final int defaultNavigationTool) {
-        putString(R.string.pref_defaultNavigationTool,
-                String.valueOf(defaultNavigationTool));
-    }
-
     public static int getDefaultNavigationTool2() {
         return Integer.parseInt(getString(
                 R.string.pref_defaultNavigationTool2,
                 String.valueOf(NavigationAppsEnum.INTERNAL_MAP.id)));
     }
 
-    public static void setDefaultNavigationTool2(final int defaultNavigationTool) {
-        putString(R.string.pref_defaultNavigationTool2,
-                String.valueOf(defaultNavigationTool));
-    }
-
     public static Strategy getLiveMapStrategy() {
         return Strategy.getById(getInt(R.string.pref_livemapstrategy, Strategy.AUTO.id));
     }
@@ -928,18 +909,10 @@ public final class Settings {
         return getString(R.string.pref_twitter_cache_message, "I found [NAME] ([URL]).");
     }
 
-    public static void setCacheTwitterMessage(final String template) {
-        putString(R.string.pref_twitter_cache_message, template);
-    }
-
     public static String getTrackableTwitterMessage() {
         return getString(R.string.pref_twitter_trackable_message, "I touched [NAME] ([URL]).");
     }
 
-    public static void setTrackableTwitterMessage(final String template) {
-        putString(R.string.pref_twitter_trackable_message, template);
-    }
-
     public static int getLogImageScale() {
         return getInt(R.string.pref_logImageScale, -1);
     }
@@ -948,11 +921,6 @@ public final class Settings {
         putInt(R.string.pref_logImageScale, scale);
     }
 
-    // Only for tests!
-    static void setExcludeDisabledCaches(final boolean exclude) {
-        putBoolean(R.string.pref_excludedisabled, exclude);
-    }
-
     public static void setExcludeMine(final boolean exclude) {
         putBoolean(R.string.pref_excludemine, exclude);
     }
@@ -971,18 +939,6 @@ public final class Settings {
         return a && b;
     }
 
-    static void setStoreOfflineMaps(final boolean offlineMaps) {
-        putBoolean(R.string.pref_offlinemaps, offlineMaps);
-    }
-
-    static void setStoreOfflineWpMaps(final boolean offlineWpMaps) {
-        putBoolean(R.string.pref_offlinewpmaps, offlineWpMaps);
-    }
-
-    static void setUseImperialUnits(final boolean imperial) {
-        putBoolean(R.string.pref_units, imperial);
-    }
-
     public static long getFieldnoteExportDate() {
         return getLong(R.string.pref_fieldnoteExportDate, 0);
     }
diff --git a/main/src/cgeo/geocaching/utils/CryptUtils.java b/main/src/cgeo/geocaching/utils/CryptUtils.java
index d98585a..5273fa5 100644
--- a/main/src/cgeo/geocaching/utils/CryptUtils.java
+++ b/main/src/cgeo/geocaching/utils/CryptUtils.java
@@ -95,20 +95,6 @@ public final class CryptUtils {
         return StringUtils.EMPTY;
     }
 
-    public static String sha1(String text) {
-        try {
-            final MessageDigest digest = MessageDigest.getInstance("SHA-1");
-            digest.update(text.getBytes(CharEncoding.UTF_8), 0, text.length());
-            return new BigInteger(1, digest.digest()).toString(16);
-        } catch (NoSuchAlgorithmException e) {
-            Log.e("CryptUtils.sha1", e);
-        } catch (UnsupportedEncodingException e) {
-            Log.e("CryptUtils.sha1", e);
-        }
-
-        return StringUtils.EMPTY;
-    }
-
     public static byte[] hashHmac(String text, String salt) {
         byte[] macBytes = {};