Merge remote-tracking branch 'origin/release'

1 files changed, 30 insertions, 0 deletions

diff --git a/main/src/cgeo/geocaching/Settings.java b/main/src/cgeo/geocaching/Settings.java
index 0c157e1..b5c8a6e 100644
--- a/main/src/cgeo/geocaching/Settings.java
+++ b/main/src/cgeo/geocaching/Settings.java
@@ -112,6 +112,7 @@ public final class Settings {
     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 static final String KEY_LOG_IMAGE_SCALE = "logImageScale";
 
     private final static int unitsMetric = 1;
 
@@ -149,6 +150,7 @@ public final class Settings {
 
     // maps
     private static MapProvider mapProvider = null;
+    private static String cacheTwitterMessage = "I found [NAME] ([URL])";
 
     private Settings() {
         // this class is not to be instantiated;
@@ -1424,4 +1426,32 @@ public final class Settings {
             }
         });
     }
+
+    public static String getCacheTwitterMessage() {
+        // TODO make customizable from UI
+        return cacheTwitterMessage;
+    }
+
+    public static String getTrackableTwitterMessage() {
+        // TODO make customizable from UI
+        return "I touched [NAME] ([URL])!";
+    }
+
+    public static void setCacheTwitterMessage(final String message) {
+        cacheTwitterMessage = message;
+    }
+
+    public static int getLogImageScale() {
+        return sharedPrefs.getInt(KEY_LOG_IMAGE_SCALE, -1);
+    }
+
+    public static void setLogImageScale(final int scale) {
+        editSharedSettings(new PrefRunnable() {
+
+            @Override
+            public void edit(Editor edit) {
+                edit.putInt(KEY_LOG_IMAGE_SCALE, scale);
+            }
+        });
+    }
 }