Merge branch 'beta' into ux/smart-lock

app/build.gradle

@@ -13,7 +13,7 @@ android {
         applicationId "chat.rocket.android"
         minSdkVersion 21
         targetSdkVersion versions.targetSdk
-        versionCode 2022
+        versionCode 2023
         versionName "2.3.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         multiDexEnabled true

app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt

@@ -276,10 +276,12 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
     ) {
         // TODO: We should rely solely on the user being able to post, but we cannot guarantee
         // that the "(channels|groups).roles" endpoint is supported by the server in use.
+        ui {
             setupMessageComposer(userCanPost)
             isBroadcastChannel = channelIsBroadcast
             if (isBroadcastChannel && !userCanMod) activity?.invalidateOptionsMenu()
         }
+    }
 
     override fun openDirectMessage(chatRoom: ChatRoom, permalink: String) {
 

app/src/main/java/chat/rocket/android/profile/presentation/ProfilePresenter.kt

@@ -58,7 +58,8 @@ class ProfilePresenter @Inject constructor(private val view: ProfileView,
                 if(avatarUrl!="") {
                     retryIO { client.setAvatar(avatarUrl) }
                 }
-                val user = retryIO { client.updateProfile(myselfId, email, name, username) }
+                val user = retryIO { client.updateProfile(
+                    userId = myselfId, email = email, name = name, username = username) }
                 view.showProfileUpdateSuccessfullyMessage()
                 loadUserProfile()
             } catch (exception: RocketChatException) {