1 files changed, 39 insertions, 17 deletions

diff --git a/main/src/cgeo/geocaching/Settings.java b/main/src/cgeo/geocaching/Settings.java
index 7e6f91f..96aab88 100644
--- a/main/src/cgeo/geocaching/Settings.java
+++ b/main/src/cgeo/geocaching/Settings.java
@@ -75,7 +75,6 @@ public final class Settings {
     private static final String KEY_AUTO_VISIT_TRACKABLES = "trackautovisit";
     private static final String KEY_AUTO_INSERT_SIGNATURE = "sigautoinsert";
     private static final String KEY_ALTITUDE_CORRECTION = "altcorrection";
-    private static final String KEY_USE_GOOGLE_NAVIGATION = "usegnav";
     private static final String KEY_STORE_LOG_IMAGES = "logimages";
     private static final String KEY_EXCLUDE_DISABLED = "excludedisabled";
     private static final String KEY_EXCLUDE_OWN = "excludemine";
@@ -110,6 +109,8 @@ public final class Settings {
     private static final String KEY_PLAIN_LOGS = "plainLogs";
     private static final String KEY_NATIVE_UA = "nativeUa";
     private static final String KEY_MAP_DIRECTORY = "mapDirectory";
+    private static final String KEY_CONNECTOR_OC_ACTIVE = "connectorOCActive";
+    private static final String KEY_CONNECTOR_OC_USER = "connectorOCUser";
 
     private final static int unitsMetric = 1;
 
@@ -192,7 +193,6 @@ public final class Settings {
             e.putBoolean(KEY_AUTO_VISIT_TRACKABLES, old.getBoolean(KEY_AUTO_VISIT_TRACKABLES, false));
             e.putBoolean(KEY_AUTO_INSERT_SIGNATURE, old.getBoolean(KEY_AUTO_INSERT_SIGNATURE, false));
             e.putInt(KEY_ALTITUDE_CORRECTION, old.getInt(KEY_ALTITUDE_CORRECTION, 0));
-            e.putBoolean(KEY_USE_GOOGLE_NAVIGATION, 0 != old.getInt(KEY_USE_GOOGLE_NAVIGATION, 1));
             e.putBoolean(KEY_STORE_LOG_IMAGES, old.getBoolean(KEY_STORE_LOG_IMAGES, false));
             e.putBoolean(KEY_EXCLUDE_DISABLED, 0 != old.getInt(KEY_EXCLUDE_DISABLED, 0));
             e.putBoolean(KEY_EXCLUDE_OWN, 0 != old.getInt(KEY_EXCLUDE_OWN, 0));
@@ -307,6 +307,42 @@ public final class Settings {
         });
     }
 
+    public static boolean isOCConnectorActive() {
+        return sharedPrefs.getBoolean(KEY_CONNECTOR_OC_ACTIVE, false);
+    }
+
+    public static boolean setOCConnectorActive(final boolean isActive) {
+        return editSharedSettings(new PrefRunnable() {
+
+            @Override
+            public void edit(Editor edit) {
+                edit.putBoolean(KEY_CONNECTOR_OC_ACTIVE, isActive);
+            }
+        });
+    }
+
+    public static String getOCConnectorUserName() {
+        String ocConnectorUser = sharedPrefs.getString(KEY_CONNECTOR_OC_USER, null);
+        if (StringUtils.isBlank(ocConnectorUser)) {
+            return StringUtils.EMPTY;
+        }
+        return ocConnectorUser;
+    }
+
+    public static boolean setOCConnectorUserName(final String userName) {
+        return editSharedSettings(new PrefRunnable() {
+
+            @Override
+            public void edit(Editor edit) {
+                if (StringUtils.isBlank(userName)) {
+                    edit.remove(KEY_CONNECTOR_OC_USER);
+                } else {
+                    edit.putString(KEY_CONNECTOR_OC_USER, userName);
+                }
+            }
+        });
+    }
+
     public static boolean isGCvoteLogin() {
         final String preUsername = sharedPrefs.getString(KEY_USERNAME, null);
         final String prePassword = sharedPrefs.getString(KEY_GCVOTE_PASSWORD, null);
@@ -672,20 +708,6 @@ public final class Settings {
         });
     }
 
-    public static boolean isUseGoogleNavigation() {
-        return sharedPrefs.getBoolean(KEY_USE_GOOGLE_NAVIGATION, true);
-    }
-
-    public static void setUseGoogleNavigation(final boolean useGoogleNavigation) {
-        editSharedSettings(new PrefRunnable() {
-
-            @Override
-            public void edit(Editor edit) {
-                edit.putBoolean(KEY_USE_GOOGLE_NAVIGATION, useGoogleNavigation);
-            }
-        });
-    }
-
     public static boolean isAutoLoadDescription() {
         return sharedPrefs.getBoolean(KEY_LOAD_DESCRIPTION, false);
     }
@@ -1331,7 +1353,7 @@ public final class Settings {
 
         FileUtils.listDir(result, directory, new ExtensionsBasedFileSelector(new String[] { "xml" }), null);
 
-        return result.toArray(new File[] {});
+        return result.toArray(new File[result.size()]);
     }
 
     private static class ExtensionsBasedFileSelector extends FileSelector {