diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2016-02-01 13:54:08 +0100 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2016-02-01 13:54:08 +0100 |
| commit | 1e7647e385a55598843f80fe39fadeda64295f87 (patch) | |
| tree | 00e7f688935094958fbdaf109a774068e5511403 /src/main/res | |
| parent | d1fc90f9810832d812c3cf5525c9a5ce27619bdd (diff) | |
opt out handling of the autojoin flag. fixes #1666
Diffstat (limited to '')
| -rw-r--r-- | src/main/res/values/strings.xml | 2 | ||||
| -rw-r--r-- | src/main/res/xml/preferences.xml | 6 |
2 files changed, 8 insertions, 0 deletions
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 @@ -187,6 +187,12 @@ </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" android:summary="@string/pref_use_indicate_received_summary" |