Merge branch 'develop-2.x' into feature/attachment-fields

app/src/main/java/chat/rocket/android/chatrooms/ui/ChatRoomsAdapter.kt

@@ -74,14 +74,17 @@ class ChatRoomsAdapter(private val context: Context,
         }
 
         private fun bindAvatar(chatRoom: ChatRoom, drawee: SimpleDraweeView) {
-            val avatarId = if (chatRoom.type is RoomType.DirectMessage) chatRoom.name else "@${chatRoom.name}"
-            drawee.setImageURI(chatRoom.client.url.avatarUrl(avatarId))
+            if (chatRoom.type is RoomType.DirectMessage) {
+                drawee.setImageURI(chatRoom.client.url.avatarUrl(chatRoom.name))
+            } else {
+                drawee.setImageURI(chatRoom.client.url.avatarUrl(chatRoom.name, true))
+            }
         }
 
         private fun bindName(chatRoom: ChatRoom, textView: TextView) {
             textView.textContent = chatRoom.name
 
-            var drawable = when (chatRoom.type) {
+            val drawable = when (chatRoom.type) {
                 is RoomType.Channel -> {
                     DrawableHelper.getDrawableFromId(R.drawable.ic_room_channel, context)
                 }

app/src/main/java/chat/rocket/android/members/viewmodel/MemberViewModel.kt

@@ -25,7 +25,7 @@ class MemberViewModel(private val member: User, private val settings: Map<String
     private fun getUserAvatar(): String? {
         val username = member.username ?: "?"
         return baseUrl?.let {
-            baseUrl.avatarUrl(username,"png")
+            baseUrl.avatarUrl(username, format = "png")
         }
     }
 

app/src/main/java/chat/rocket/android/util/extensions/String.kt

@@ -10,8 +10,13 @@ fun String.removeTrailingSlash(): String {
     }
 }
 
-fun String.avatarUrl(avatar: String, format: String = "jpeg") =
-    "${removeTrailingSlash()}/avatar/${avatar.removeTrailingSlash()}?format=$format"
+fun String.avatarUrl(avatar: String, isGroupOrChannel: Boolean = false, format: String = "jpeg"): String {
+    return if (isGroupOrChannel) {
+        "${removeTrailingSlash()}/avatar/%23${avatar.removeTrailingSlash()}?format=$format"
+    } else {
+        "${removeTrailingSlash()}/avatar/${avatar.removeTrailingSlash()}?format=$format"
+    }
+}
 
 fun String.serverLogoUrl(favicon: String) = "${removeTrailingSlash()}/$favicon"