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 e218c141a9fb3ff6e83d4b201b4cdadddf219494..d88eb752d3dcaf26551dd7decdc815a99d67d4a8 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 c75c1af9621323e712eea54411affd2981b4b279..c4dfa7cc4305e0de2fbefa6ac1f516f1bdc2871a 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"