Fix more refactoring mistakes once again

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

@@ -13,10 +13,10 @@ import chat.rocket.core.internal.rest.setAvatar
 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
@@ -29,17 +29,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()
             }

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

@@ -56,8 +56,8 @@ class ProfileFragment : Fragment(), ProfileView, ActionMode.Callback {
         text_email.textContent = email
         text_avatar_url.textContent = ""
 
-        currentName = name
-        currentUsername = username
+        currentName = username
+        currentUsername = name
         currentEmail = email
         currentAvatar = avatarUrl