From e65712d47a5a675e1e74f1148445c999d15e69fb Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Sat, 9 Jun 2018 01:52:16 +0200
Subject: [PATCH] =?UTF-8?q?Fixes=20#126=20=E2=80=93=20only=20initial=20and?=
 =?UTF-8?q?=20color=20in=20chat=20list=20if=20avatars=20are=20off?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kuschku/quasseldroid/util/avatars/AvatarHelper.kt  |  6 +++---
 app/src/main/res/xml/preferences.xml                   | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/avatars/AvatarHelper.kt b/app/src/main/java/de/kuschku/quasseldroid/util/avatars/AvatarHelper.kt
index e218c141a..d88eb752d 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/avatars/AvatarHelper.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/avatars/AvatarHelper.kt
@@ -39,13 +39,13 @@ object AvatarHelper {
                      avatarUrl: String?, size: Int?) =
     listOfNotNull(
       avatarUrl.notBlank()?.let { listOf(Avatar.NativeAvatar(it)) },
-      settings.showIRCCloudAvatars.letIf {
+      (settings.showAvatars && settings.showIRCCloudAvatars).letIf {
         ircCloudFallback(ident, size)
       },
-      settings.showGravatarAvatars.letIf {
+      (settings.showAvatars && settings.showGravatarAvatars).letIf {
         gravatarFallback(realName, size)
       },
-      settings.showMatrixAvatars.letIf {
+      (settings.showAvatars && settings.showMatrixAvatars).letIf {
         matrixFallback(realName, size)
       }
     ).flatten()
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index c75c1af96..c4dfa7cc4 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -156,16 +156,16 @@
       android:key="@string/preference_show_prefix_key"
       android:title="@string/preference_show_prefix_title" />
 
-    <SwitchPreference
-      android:defaultValue="true"
-      android:key="@string/preference_show_avatars_key"
-      android:title="@string/preference_show_avatars_title" />
-
     <SwitchPreference
       android:defaultValue="false"
       android:key="@string/preference_square_avatars_key"
       android:title="@string/preference_square_avatars_title" />
 
+    <SwitchPreference
+      android:defaultValue="true"
+      android:key="@string/preference_show_avatars_key"
+      android:title="@string/preference_show_avatars_title" />
+
     <SwitchPreference
       android:defaultValue="false"
       android:dependency="@string/preference_show_avatars_key"
-- 
GitLab