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 4a4409fa7..16b0b58b2 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt +++ b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt @@ -356,6 +356,11 @@ class ChatController(args: Bundle) : BaseController(), MessagesListAdapter adapter = MessagesListAdapter( conversationUser?.userId, messageHolders, ImageLoader { imageView, url, payload -> imageView.load(url) { + if (conversationUser != null && url!!.startsWith(conversationUser.baseUrl) && (url.contains( + "index.php/core/preview?fileId=") || url.contains("/avatar/"))) { + addHeader("Authorization", conversationUser.getCredentials()) + } + if (url!!.contains("/avatar/")) { transformations(CircleCropTransformation()) } else { @@ -371,11 +376,6 @@ class ChatController(args: Bundle) : BaseController(), MessagesListAdapter } } } - - if (conversationUser != null && url.startsWith(conversationUser.baseUrl) && url.contains( - "index.php/core/preview?fileId=")) { - addHeader("Authorization", conversationUser.getCredentials()) - } } }) } else {