Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase

2 files changed, 19 insertions, 0 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/ConversationsPlusApplication.java b/src/main/java/de/thedevstack/conversationsplus/ConversationsPlusApplication.java
index 0ca0b394..f86c509a 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ConversationsPlusApplication.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ConversationsPlusApplication.java
@@ -27,6 +27,10 @@ public class ConversationsPlusApplication extends Application {
         ConversationsPlusPreferences.init(PreferenceManager.getDefaultSharedPreferences(getAppContext()));
     }
 
+    public static ConversationsPlusApplication getInstance() {
+        return ConversationsPlusApplication.instance;
+    }
+
     /**
      * Returns the application's context.
      * @return Context the application's context
diff --git a/src/main/java/de/thedevstack/conversationsplus/ConversationsPlusPreferences.java b/src/main/java/de/thedevstack/conversationsplus/ConversationsPlusPreferences.java
index 788aed41..b20cfb8f 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ConversationsPlusPreferences.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ConversationsPlusPreferences.java
@@ -13,6 +13,21 @@ public class ConversationsPlusPreferences extends Settings {
     private static ConversationsPlusPreferences instance;
     private final SharedPreferences sharedPreferences;
 
+    /**
+     * Whether automatic downloads should only be done when connected to Wifi or not.
+     * @return
+     */
+    public static boolean autoDownloadFileWLAN() {
+        return getBoolean("auto_download_file_wlan", true);
+    }
+    /**
+     * Whether image-links should be downloaded or not.
+     * @return
+     */
+    public static boolean autoDownloadFileLink() {
+        return getBoolean("auto_download_file_link", true);
+    }
+
     public static boolean showDynamicTags() {
         return getBoolean("show_dynamic_tags", false);
     }