Fix more refactoring mistakes once again

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

@@ -12,10 +12,10 @@ import chat.rocket.core.internal.rest.me
 import chat.rocket.core.internal.rest.updateProfile
 import javax.inject.Inject
 
-class ProfilePresenter @Inject constructor (private val view: ProfileView,
-                                            private val strategy: CancelStrategy,
-                                            serverInteractor: GetCurrentServerInteractor,
-                                            factory: RocketChatClientFactory) {
+class ProfilePresenter @Inject constructor(private val view: ProfileView,
+                                           private val strategy: CancelStrategy,
+                                           serverInteractor: GetCurrentServerInteractor,
+                                           factory: RocketChatClientFactory) {
     private val serverUrl = serverInteractor.get()!!
     private val client: RocketChatClient = factory.create(serverUrl)
     private lateinit var myselfId: String
@@ -28,17 +28,17 @@ class ProfilePresenter @Inject constructor (private val view: ProfileView,
                 myselfId = myself.id
                 val avatarUrl = UrlHelper.getAvatarUrl(serverUrl, myself.username!!)
                 view.showProfile(
-                    avatarUrl,
-                    myself.name ?: "",
-                    myself.username ?: "",
-                    myself.emails?.get(0)?.address!!
+                        avatarUrl,
+                        myself.name ?: "",
+                        myself.username ?: "",
+                        myself.emails?.get(0)?.address!!
                 )
             } catch (exception: RocketChatException) {
                 exception.message?.let {
                     view.showMessage(it)
                 }.ifNull {
-                        view.showGenericErrorMessage()
-                    }
+                    view.showGenericErrorMessage()
+                }
             } finally {
                 view.hideLoading()
             }
@@ -49,15 +49,15 @@ class ProfilePresenter @Inject constructor (private val view: ProfileView,
         launchUI(strategy) {
             view.showLoading()
             try {
-                val user = client.updateProfile(myselfId, email, name, username)
+                val user = client.updateProfile(myselfId, email, name, null, username)
                 view.showProfileUpdateSuccessfullyMessage()
                 loadUserProfile()
             } catch (exception: RocketChatException) {
                 exception.message?.let {
                     view.showMessage(it)
                 }.ifNull {
-                        view.showGenericErrorMessage()
-                    }
+                    view.showGenericErrorMessage()
+                }
             } finally {
                 view.hideLoading()
             }

app/src/main/java/chat/rocket/android/profile/ui/ProfileFragment.kt

@@ -54,8 +54,8 @@ class ProfileFragment : Fragment(), ProfileView, ActionMode.Callback {
         text_username.textContent = username
         text_email.textContent = email
 
-        currentName = name
-        currentUsername = username
+        currentName = username
+        currentUsername = name
         currentEmail = email
 
         profile_container.setVisible(true)
@@ -92,7 +92,7 @@ class ProfileFragment : Fragment(), ProfileView, ActionMode.Callback {
     override fun onActionItemClicked(mode: ActionMode, menuItem: MenuItem): Boolean {
         return when (menuItem.itemId) {
             R.id.action_profile -> {
-                presenter.updateUserProfile(text_email.textContent, text_username.textContent, text_username.textContent)
+                presenter.updateUserProfile(text_email.textContent, text_name.textContent, text_username.textContent)
                 mode.finish()
                 true
             }