浏览代码

Workaround for crash when loading avatar

Signed-off-by: Dariusz Olszewski <starypatyk@users.noreply.github.com>
Dariusz Olszewski 3 年之前
父节点
当前提交
ddcf1c48aa
共有 1 个文件被更改,包括 11 次插入6 次删除
  1. 11 6
      app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt

+ 11 - 6
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)
-
-                            val roundedBitmapDrawable = RoundedBitmapDrawableFactory.create(resources!!, bitmapResized)
-                            roundedBitmapDrawable.isCircular = true
-                            roundedBitmapDrawable.setAntiAlias(true)
-                            actionBar?.setIcon(roundedBitmapDrawable)
+                            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)
+                            } else {
+                                Log.d(TAG, "loadAvatarForStatusBar avatarSize <= 0")
+                            }
                         }
                     }