From d5174232bc6e9155ca5759db179931a26d628ec8 Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Sun, 6 Jan 2019 17:15:07 +0100
Subject: [PATCH] Clean up avatar loading logic
---
.../de/kuschku/quasseldroid/util/avatars/AvatarHelper.kt | 2 +-
.../de/kuschku/quasseldroid/util/helper/GlideHelper.kt | 8 ++++----
2 files changed, 5 insertions(+), 5 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 140b2e421..5c9b3b4d6 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
@@ -113,5 +113,5 @@ object AvatarHelper {
}
}
- private fun truncateSize(originalSize: Int) = if (originalSize > 72) 512 else 72
+ private fun truncateSize(originalSize: Int) = originalSize //if (originalSize > 72) 512 else 72
}
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/helper/GlideHelper.kt b/app/src/main/java/de/kuschku/quasseldroid/util/helper/GlideHelper.kt
index c5b5afe3f..baeb49f01 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/helper/GlideHelper.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/helper/GlideHelper.kt
@@ -32,10 +32,10 @@ import de.kuschku.quasseldroid.viewmodel.data.Avatar
fun GlideRequests.loadWithFallbacks(urls: List<Avatar>): GlideRequest<Drawable>? {
fun fold(url: Avatar, fallback: RequestBuilder<Drawable>?): GlideRequest<Drawable> {
return when (url) {
- is Avatar.NativeAvatar -> this.load(url.url)
- is Avatar.GravatarAvatar -> this.load(url.url)
- is Avatar.IRCCloudAvatar -> this.load(url.url)
- is Avatar.MatrixAvatar -> this.load(url)
+ is Avatar.NativeAvatar -> load(url.url)
+ is Avatar.GravatarAvatar -> load(url.url)
+ is Avatar.IRCCloudAvatar -> load(url.url)
+ is Avatar.MatrixAvatar -> load(url)
}.let {
if (fallback != null) it.error(fallback) else it
}
--
GitLab