Merge branch 'develop-2.x' into new/insert-username

app/build.gradle

@@ -13,8 +13,8 @@ android {
         applicationId "chat.rocket.android"
         minSdkVersion 21
         targetSdkVersion versions.targetSdk
-        versionCode 2001
-        versionName "2.0.0-beta1"
+        versionCode 2002
+        versionName "2.0.0-beta2"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
     }

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

@@ -144,7 +144,8 @@ class MainPresenter @Inject constructor(
 
     suspend fun refreshToken(token: String?) {
         token?.let {
-            client.registerPushToken(it, getAccountsInteractor.get(), factory)
+            localRepository.save(LocalRepository.KEY_PUSH_TOKEN, token)
+            client.registerPushToken(token, getAccountsInteractor.get(), factory)
         }
     }
 }
\ No newline at end of file

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

@@ -49,9 +49,13 @@ class MainActivity : AppCompatActivity(), MainView, HasActivityInjector, HasSupp
         setContentView(R.layout.activity_main)
 
         launch(CommonPool) {
-            val token = InstanceID.getInstance(this@MainActivity).getToken(getString(R.string.gcm_sender_id), GoogleCloudMessaging.INSTANCE_ID_SCOPE, null)
-            Timber.d("GCM token: $token")
-            presenter.refreshToken(token)
+            try {
+                val token = InstanceID.getInstance(this@MainActivity).getToken(getString(R.string.gcm_sender_id), GoogleCloudMessaging.INSTANCE_ID_SCOPE, null)
+                Timber.d("GCM token: $token")
+                presenter.refreshToken(token)
+            } catch (ex: Exception) {
+                Timber.d(ex, "Missing play services...")
+            }
         }
 
         presenter.connect()

app/src/main/java/chat/rocket/android/push/FirebaseTokenService.kt

@@ -35,17 +35,19 @@ class FirebaseTokenService : FirebaseInstanceIdService() {
         // default push gateway. We should register this project's own project sender id into it.
         val gcmToken = InstanceID.getInstance(this)
                 .getToken(getString(R.string.gcm_sender_id), GoogleCloudMessaging.INSTANCE_ID_SCOPE, null)
-        val currentServer = getCurrentServerInteractor.get()!!
-        val client = factory.create(currentServer)
+        val currentServer = getCurrentServerInteractor.get()
+        val client = currentServer?.let { factory.create(currentServer) }
 
         gcmToken?.let {
             localRepository.save(LocalRepository.KEY_PUSH_TOKEN, gcmToken)
-            launch {
-                try {
-                    Timber.d("Registering push token: $gcmToken for ${client.url}")
-                    client.registerPushToken(gcmToken)
-                } catch (ex: RocketChatException) {
-                    Timber.e(ex)
+            client?.let {
+                launch {
+                    try {
+                        Timber.d("Registering push token: $gcmToken for ${client.url}")
+                        client.registerPushToken(gcmToken)
+                    } catch (ex: RocketChatException) {
+                        Timber.e(ex)
+                    }
                 }
             }
         }