From ddcf1c48aa465d99424eecbb7e6c8880f8c47687 Mon Sep 17 00:00:00 2001
From: Dariusz Olszewski <starypatyk@users.noreply.github.com>
Date: Fri, 11 Mar 2022 21:45:57 +0100
Subject: [PATCH] Workaround for crash when loading avatar
Signed-off-by: Dariusz Olszewski <starypatyk@users.noreply.github.com>
---
.../nextcloud/talk/controllers/ChatController.kt | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
index 2343f89da..9bc0e569a 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
+++ b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
@@ -424,12 +424,17 @@ class ChatController(args: Bundle) :
if (actionBar != null && bitmap != null && resources != null) {
val avatarSize = (actionBar?.height!! / 1.5).roundToInt()
- val bitmapResized = Bitmap.createScaledBitmap(bitmap, avatarSize, avatarSize, false)
+ if (avatarSize > 0) {
+ val bitmapResized = Bitmap.createScaledBitmap(bitmap, avatarSize, avatarSize, false)
- val roundedBitmapDrawable = RoundedBitmapDrawableFactory.create(resources!!, bitmapResized)
- roundedBitmapDrawable.isCircular = true
- roundedBitmapDrawable.setAntiAlias(true)
- actionBar?.setIcon(roundedBitmapDrawable)
+ val roundedBitmapDrawable =
+ RoundedBitmapDrawableFactory.create(resources!!, bitmapResized)
+ roundedBitmapDrawable.isCircular = true
+ roundedBitmapDrawable.setAntiAlias(true)
+ actionBar?.setIcon(roundedBitmapDrawable)
+ } else {
+ Log.d(TAG, "loadAvatarForStatusBar avatarSize <= 0")
+ }
}
}