Merge pull request #1299 from RocketChat/fix/notification-not-showing-when-changing-users

[FIX] Notification not showing after logging out and log in with different user on the same server

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

@@ -177,6 +177,7 @@ class MainPresenter @Inject constructor(
         if (pushToken != null) {
             try {
                 retryIO("unregisterPushToken") { client.unregisterPushToken(pushToken) }
+                view.invalidateToken(pushToken)
             } catch (ex: Exception) {
                 Timber.d(ex, "Error unregistering push token")
             }

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

@@ -24,4 +24,5 @@ interface MainView : MessageView, VersionCheckView {
     fun setupNavHeader(viewModel: NavHeaderViewModel, accounts: List<Account>)
 
     fun closeServerSelection()
+    fun invalidateToken(token: String)
 }
\ No newline at end of file

app/src/main/java/chat/rocket/android/main/ui/MainActivity.kt

@@ -134,6 +134,10 @@ class MainActivity : AppCompatActivity(), MainView, HasActivityInjector, HasSupp
                 .show()
     }
 
+    override fun invalidateToken(token: String) {
+        InstanceID.getInstance(this).deleteToken(token, GoogleCloudMessaging.INSTANCE_ID_SCOPE)
+    }
+
     private fun setupAccountsList(header: View, accounts: List<Account>) {
         accounts_list.layoutManager = LinearLayoutManager(this)
         accounts_list.adapter = AccountsAdapter(accounts, object : Selector {