From 1e7647e385a55598843f80fe39fadeda64295f87 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Mon, 1 Feb 2016 13:54:08 +0100
Subject: opt out handling of the autojoin flag. fixes #1666

---
 src/main/res/values/strings.xml  | 2 ++
 src/main/res/xml/preferences.xml | 6 ++++++
 2 files changed, 8 insertions(+)

(limited to 'src/main/res')

diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index febe2ae3..9c472d0c 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -331,6 +331,8 @@
 	<string name="pref_expert_options_other">Other</string>
 	<string name="pref_conference_name">Conference name</string>
 	<string name="pref_conference_name_summary">Use room’s subject instead of JID to identify conferences</string>
+	<string name="pref_autojoin">Automatically join conferences</string>
+	<string name="pref_autojoin_summary">Respect the autojoin flag in conference bookmarks</string>
 	<string name="toast_message_otr_fingerprint">OTR fingerprint copied to clipboard!</string>
 	<string name="toast_message_omemo_fingerprint">OMEMO fingerprint copied to clipboard!</string>
 	<string name="conference_banned">You are banned from this conference</string>
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index 6a5974c0..382b3199 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -186,6 +186,12 @@
                     android:title="@string/pref_xa_on_silent_mode"/>
             </PreferenceCategory>
             <PreferenceCategory android:title="@string/pref_expert_options_other">
+                <CheckBoxPreference
+                    android:key="autojoin"
+                    android:defaultValue="true"
+                    android:title="@string/pref_autojoin"
+                    android:summary="@string/pref_autojoin_summary"
+                    />
                 <CheckBoxPreference
                     android:defaultValue="false"
                     android:key="indicate_received"
-- 
cgit v1.2.3