Logout on invalid token.

app/src/main/java/chat/rocket/android/main/presentation/MainPresenter.kt

@@ -11,6 +11,7 @@ import chat.rocket.android.server.infraestructure.ConnectionManagerFactory
 import chat.rocket.android.server.infraestructure.RocketChatClientFactory
 import chat.rocket.android.util.extensions.launchUI
 import chat.rocket.android.util.extensions.registerPushToken
+import chat.rocket.common.RocketChatAuthException
 import chat.rocket.common.RocketChatException
 import chat.rocket.common.util.ifNull
 import chat.rocket.core.RocketChatClient
@@ -55,6 +56,11 @@ class MainPresenter @Inject constructor(
                 saveAccount(model)
                 view.setupNavHeader(model, getAccountsInteractor.get())
             } catch (ex: Exception) {
+                when (ex) {
+                    is RocketChatAuthException -> {
+                        logout()
+                    }
+                    else -> {
                         Timber.d(ex, "Error loading my information for navheader")
                         ex.message?.let {
                             view.showMessage(it)
@@ -64,6 +70,8 @@ class MainPresenter @Inject constructor(
                     }
                 }
             }
+        }
+    }
 
     private suspend fun saveAccount(me: NavHeaderViewModel) {
         val icon = settings.favicon()?.let {
@@ -81,17 +89,25 @@ class MainPresenter @Inject constructor(
             try {
                 clearTokens()
                 client.logout()
-                disconnect()
-                removeAccountInterector.remove(currentServer)
-                tokenRepository.remove(currentServer)
-                navigator.toNewServer()
             } catch (exception: RocketChatException) {
+                Timber.d(exception, "Error calling logout")
                 exception.message?.let {
                     view.showMessage(it)
                 }.ifNull {
                     view.showGenericErrorMessage()
                 }
             }
+
+            try {
+                disconnect()
+                removeAccountInterector.remove(currentServer)
+                tokenRepository.remove(currentServer)
+                navigator.toNewServer()
+            } catch (ex: Exception) {
+                Timber.d(ex, "Error cleaning up the session...")
+            }
+
+            navigator.toNewServer()
         }
     }
 
@@ -100,7 +116,6 @@ class MainPresenter @Inject constructor(
         val pushToken = localRepository.get(LocalRepository.KEY_PUSH_TOKEN)
         if (pushToken != null) {
             client.unregisterPushToken(pushToken)
-            localRepository.clear(LocalRepository.KEY_PUSH_TOKEN)
         }
         localRepository.clearAllFromServer(currentServer)
     }

app/src/main/java/chat/rocket/android/main/viewmodel/NavHeaderViewModelMapper.kt

@@ -7,16 +7,16 @@ import javax.inject.Inject
 
 class NavHeaderViewModelMapper @Inject constructor(serverInteractor: GetCurrentServerInteractor,
                                                    getSettingsInteractor: GetSettingsInteractor) {
-    private var settings: PublicSettings = getSettingsInteractor.get(serverInteractor.get()!!)
-    private val baseUrl = settings.baseUrl()!!
+    private val currentServer = serverInteractor.get()!!
+    private var settings: PublicSettings = getSettingsInteractor.get(currentServer)
 
     fun mapToViewModel(me: Myself): NavHeaderViewModel {
         val username = mapUsername(me)
-        val thumb = me.username?.let { UrlHelper.getAvatarUrl(baseUrl, it) }
+        val thumb = me.username?.let { UrlHelper.getAvatarUrl(currentServer, it) }
         val image = settings.wideTile() ?: settings.faviconLarge()
-        val logo = image?.let { UrlHelper.getServerLogoUrl(baseUrl, it) }
+        val logo = image?.let { UrlHelper.getServerLogoUrl(currentServer, it) }
 
-        return NavHeaderViewModel(username, baseUrl, thumb, logo)
+        return NavHeaderViewModel(username, currentServer, thumb, logo)
     }
 
     private fun mapUsername(me: Myself): String {

app/src/main/java/chat/rocket/android/server/domain/SettingsRepository.kt

@@ -95,5 +95,5 @@ fun PublicSettings.uploadMaxFileSize(): Int {
     return this[UPLOAD_MAX_FILE_SIZE]?.value?.let { it as Int } ?: Int.MAX_VALUE
 }
 
-fun PublicSettings.baseUrl(): String? = this[SITE_URL]?.value as String
+fun PublicSettings.baseUrl(): String? = this[SITE_URL]?.value as String?
 fun PublicSettings.siteName(): String? = this[SITE_NAME]?.value as String?
\ No newline at end of file