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

Conflicts:
	src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java

1 files changed, 43 insertions, 0 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/ConversationsPlusPreferences.java b/src/main/java/de/thedevstack/conversationsplus/ConversationsPlusPreferences.java
index dda4208c..d22a10d6 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ConversationsPlusPreferences.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ConversationsPlusPreferences.java
@@ -81,6 +81,49 @@ public class ConversationsPlusPreferences extends Settings {
         return getBoolean("enable_legacy_ssl", false);
     }
 
+    public static boolean showBatteryOptimization() {
+        return getBoolean("show_battery_optimization", true);
+    }
+
+    public static void commitShowBatteryOptimization(boolean showBatteryOptimization) {
+        commitBoolean("show_battery_optimization", showBatteryOptimization);
+    }
+
+    public static boolean advancedMucMode() {
+        return getBoolean("advanced_muc_mode", false);
+    }
+
+    public static void commitAdvancedMucMode(boolean advancedMucMode) {
+        commitBoolean("advanced_muc_mode", advancedMucMode);
+    }
+
+    /**
+     * Whether to show extended connection options or not
+     * @return
+     */
+    public static boolean showConnectionOptions() {
+        return getBoolean("show_connection_options", false);
+    }
+
+    /**
+     * Whether to respect auto join on bookmarks or not.
+     * @return
+     */
+    public static boolean autojoin() {
+        return getBoolean("autojoin", true);
+    }
+    public static boolean xaOnSilentMode() {
+        return getBoolean("xa_on_silent_mode", false);
+    }
+
+    public static boolean treatVibrateAsSilent() {
+        return getBoolean("treat_vibrate_as_silent", false);
+    }
+
+    public static boolean awayWhenScreenOff() {
+        return getBoolean("away_when_screen_off", false);
+    }
+
     public static boolean useSubject() {
         return getBoolean("use_subject", true);
     }