aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/res')
-rw-r--r--src/main/res/values/bools.xml4
-rw-r--r--src/main/res/values/strings.xml2
-rw-r--r--src/main/res/xml/preferences.xml5
3 files changed, 11 insertions, 0 deletions
diff --git a/src/main/res/values/bools.xml b/src/main/res/values/bools.xml
new file mode 100644
index 000000000..4807728ca
--- /dev/null
+++ b/src/main/res/values/bools.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <bool name="prefer_xmpp_avatar">true</bool>
+</resources> \ No newline at end of file
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 5f3d159e7..188fc764c 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -868,4 +868,6 @@
<string name="restore_warning">Do not use the restore backup feature in an attempt to clone (run simultaneously) an installation. Restoring a backup is only meant for migrations or in case you have lost the original device.</string>
<string name="unable_to_restore_backup">Unable to restore backup.</string>
<string name="unable_to_decrypt_backup">Unable to decrypt backup. Is the password correct?</string>
+ <string name="pref_prefer_xmpp_avatar_summary">Prefer the users XMPP avatar instead of the one from your address book</string>
+ <string name="pref_prefer_xmpp_avatar">Prefer XMPP avatar</string>
</resources>
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index 0244da459..52a957f98 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -76,6 +76,11 @@
android:key="play_gif_inside"
android:summary="@string/pref_play_gif_inside_summary"
android:title="@string/pref_play_gif_inside" />
+ <CheckBoxPreference
+ android:defaultValue="@bool/prefer_xmpp_avatar"
+ android:key="prefer_xmpp_avatar"
+ android:summary="@string/pref_prefer_xmpp_avatar_summary"
+ android:title="@string/pref_prefer_xmpp_avatar" />
</PreferenceScreen>
<!--Notifications-->
<PreferenceScreen