Independently of a new registration token being generated or not just send the...

Independently of a new registration token being generated or not just send the current if available at every connect

app/src/main/java/chat/rocket/android/service/observer/GcmPushRegistrationObserver.java

@@ -13,6 +13,7 @@ import chat.rocket.android.R;
 import chat.rocket.android.RocketChatCache;
 import chat.rocket.android.api.RaixPushHelper;
 import chat.rocket.android.helper.LogIfError;
+import chat.rocket.android.push.gcm.GcmPushHelper;
 import chat.rocket.core.SyncState;
 import chat.rocket.persistence.realm.RealmHelper;
 import chat.rocket.persistence.realm.models.ddp.RealmUser;
@@ -24,6 +25,7 @@ import io.realm.RealmResults;
  * call raix:push-update if needed.
  */
 public class GcmPushRegistrationObserver extends AbstractModelObserver<GcmPushRegistration> {
+
     public GcmPushRegistrationObserver(Context context, String hostname,
                                        RealmHelper realmHelper) {
         super(context, hostname, realmHelper);
@@ -39,11 +41,19 @@ public class GcmPushRegistrationObserver extends AbstractModelObserver<GcmPushRe
 
     @Override
     public void onUpdateResults(List<GcmPushRegistration> results) {
-    if (results.isEmpty()) {
-      return;
+        String gcmToken = GcmPushHelper.INSTANCE.getGcmToken();
+        if (gcmToken != null && !gcmToken.isEmpty()) {
+            // We already have gcm token, so try to register it.
+            try {
+                tryToRegisterToken();
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
     }
 
-    realmHelper.executeTransaction(realm -> {
+    private Task<Void> tryToRegisterToken() {
+        return realmHelper.executeTransaction(realm -> {
             GcmPushRegistration.queryDefault(realm).findFirst().setSyncState(SyncState.SYNCING);
             return null;
         }).onSuccessTask(_task -> registerGcmTokenForServer()