added settings for accepting and downloading files

fix in Settings, initialize with same values like in preferences.xml

1 files changed, 16 insertions, 2 deletions

diff --git a/src/main/java/de/tzur/conversations/Settings.java b/src/main/java/de/tzur/conversations/Settings.java
index cc2ac045..ff253e40 100644
--- a/src/main/java/de/tzur/conversations/Settings.java
+++ b/src/main/java/de/tzur/conversations/Settings.java
@@ -38,20 +38,34 @@ public final class Settings {
             case "led_notify_color":
                 Settings.LED_COLOR = preferences.getInt(name, Settings.LED_COLOR);
                 break;
+            case "auto_download_file_wlan":
+                Settings.DOWNLOAD_ONLY_WLAN = preferences.getBoolean(name, Settings.DOWNLOAD_ONLY_WLAN);
+                break;
+            case "auto_download_file_link":
+                Settings.DOWNLOAD_IMAGE_LINKS = preferences.getBoolean(name, Settings.DOWNLOAD_IMAGE_LINKS);
+                break;
         }
     }
     /**
      * Boolean if emoticons should be parsed to emoticons or not.
      */
-    public static boolean PARSE_EMOTICONS = false;
+    public static boolean PARSE_EMOTICONS = true;
     /**
      * Boolean if online status should be shown or not.
      */
-    public static boolean SHOW_ONLINE_STATUS = false;
+    public static boolean SHOW_ONLINE_STATUS = true;
     /**
      * LED Color
      */
     public static int LED_COLOR = 0xffffffff;
+    /**
+     * Boolean if image-links should be downloaded or not.
+     */
+    public static boolean DOWNLOAD_IMAGE_LINKS = true;
+    /**
+     * Boolean if automatic downloads should be done only jif connected to WLAN.
+     */
+    public static boolean DOWNLOAD_ONLY_WLAN = true;
 
     /**
      * This is a utility class - private constructor avoids any instantiation.