Skip to content
Snippets Groups Projects
Verified Commit e65712d4 authored by Janne Mareike Koschinski's avatar Janne Mareike Koschinski
Browse files

Fixes #126 – only initial and color in chat list if avatars are off

parent 8e9fac5e
No related branches found
No related tags found
No related merge requests found
...@@ -39,13 +39,13 @@ object AvatarHelper { ...@@ -39,13 +39,13 @@ object AvatarHelper {
avatarUrl: String?, size: Int?) = avatarUrl: String?, size: Int?) =
listOfNotNull( listOfNotNull(
avatarUrl.notBlank()?.let { listOf(Avatar.NativeAvatar(it)) }, avatarUrl.notBlank()?.let { listOf(Avatar.NativeAvatar(it)) },
settings.showIRCCloudAvatars.letIf { (settings.showAvatars && settings.showIRCCloudAvatars).letIf {
ircCloudFallback(ident, size) ircCloudFallback(ident, size)
}, },
settings.showGravatarAvatars.letIf { (settings.showAvatars && settings.showGravatarAvatars).letIf {
gravatarFallback(realName, size) gravatarFallback(realName, size)
}, },
settings.showMatrixAvatars.letIf { (settings.showAvatars && settings.showMatrixAvatars).letIf {
matrixFallback(realName, size) matrixFallback(realName, size)
} }
).flatten() ).flatten()
......
...@@ -156,16 +156,16 @@ ...@@ -156,16 +156,16 @@
android:key="@string/preference_show_prefix_key" android:key="@string/preference_show_prefix_key"
android:title="@string/preference_show_prefix_title" /> 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 <SwitchPreference
android:defaultValue="false" android:defaultValue="false"
android:key="@string/preference_square_avatars_key" android:key="@string/preference_square_avatars_key"
android:title="@string/preference_square_avatars_title" /> 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 <SwitchPreference
android:defaultValue="false" android:defaultValue="false"
android:dependency="@string/preference_show_avatars_key" android:dependency="@string/preference_show_avatars_key"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment