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,63 +25,72 @@ 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);
-  }
 
-  @Override
-  public RealmResults<GcmPushRegistration> queryItems(Realm realm) {
-    return GcmPushRegistration.queryDefault(realm)
-        .equalTo(GcmPushRegistration.SYNC_STATE, SyncState.NOT_SYNCED)
-        .equalTo(GcmPushRegistration.GCM_PUSH_ENABLED, true)
-        .findAll();
-  }
+    public GcmPushRegistrationObserver(Context context, String hostname,
+                                       RealmHelper realmHelper) {
+        super(context, hostname, realmHelper);
+    }
 
-  @Override
-  public void onUpdateResults(List<GcmPushRegistration> results) {
-    if (results.isEmpty()) {
-      return;
+    @Override
+    public RealmResults<GcmPushRegistration> queryItems(Realm realm) {
+        return GcmPushRegistration.queryDefault(realm)
+                .equalTo(GcmPushRegistration.SYNC_STATE, SyncState.NOT_SYNCED)
+                .equalTo(GcmPushRegistration.GCM_PUSH_ENABLED, true)
+                .findAll();
     }
 
-    realmHelper.executeTransaction(realm -> {
-      GcmPushRegistration.queryDefault(realm).findFirst().setSyncState(SyncState.SYNCING);
-      return null;
-    }).onSuccessTask(_task -> registerGcmTokenForServer()
-    ).onSuccessTask(_task ->
-        realmHelper.executeTransaction(realm -> {
-          GcmPushRegistration.queryDefault(realm).findFirst().setSyncState(SyncState.SYNCED);
-          return null;
-        })
-    ).continueWith(task -> {
-      if (task.isFaulted()) {
-        realmHelper.executeTransaction(realm -> {
-          GcmPushRegistration.queryDefault(realm).findFirst().setSyncState(SyncState.FAILED);
-          return null;
-        }).continueWith(new LogIfError());
-      }
-      return null;
-    });
-  }
+    @Override
+    public void onUpdateResults(List<GcmPushRegistration> results) {
+        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();
+            }
+        }
+    }
 
-  private Task<Void> registerGcmTokenForServer() throws IOException {
-    final String gcmToken = getGcmToken(getSenderId());
-    final RealmUser currentUser = realmHelper.executeTransactionForRead(realm ->
-        RealmUser.queryCurrentUser(realm).findFirst());
-    final String userId = currentUser != null ? currentUser.getId() : null;
-    final String pushId = RocketChatCache.INSTANCE.getOrCreatePushId();
+    private Task<Void> tryToRegisterToken() {
+        return realmHelper.executeTransaction(realm -> {
+            GcmPushRegistration.queryDefault(realm).findFirst().setSyncState(SyncState.SYNCING);
+            return null;
+        }).onSuccessTask(_task -> registerGcmTokenForServer()
+        ).onSuccessTask(_task ->
+                realmHelper.executeTransaction(realm -> {
+                    GcmPushRegistration.queryDefault(realm).findFirst().setSyncState(SyncState.SYNCED);
+                    return null;
+                })
+        ).continueWith(task -> {
+            if (task.isFaulted()) {
+                realmHelper.executeTransaction(realm -> {
+                    GcmPushRegistration.queryDefault(realm).findFirst().setSyncState(SyncState.FAILED);
+                    return null;
+                }).continueWith(new LogIfError());
+            }
+            return null;
+        });
+    }
 
-    return new RaixPushHelper(realmHelper)
-        .pushUpdate(pushId, gcmToken, userId);
-  }
+    private Task<Void> registerGcmTokenForServer() throws IOException {
+        final String gcmToken = getGcmToken(getSenderId());
+        final RealmUser currentUser = realmHelper.executeTransactionForRead(realm ->
+                RealmUser.queryCurrentUser(realm).findFirst());
+        final String userId = currentUser != null ? currentUser.getId() : null;
+        final String pushId = RocketChatCache.INSTANCE.getOrCreatePushId();
 
-  private String getGcmToken(String senderId) throws IOException {
-    return InstanceID.getInstance(context)
-        .getToken(senderId, GoogleCloudMessaging.INSTANCE_ID_SCOPE, null);
-  }
+        return new RaixPushHelper(realmHelper)
+                .pushUpdate(pushId, gcmToken, userId);
+    }
 
-  private String getSenderId() {
-    return context.getString(R.string.gcm_sender_id);
-  }
+    private String getGcmToken(String senderId) throws IOException {
+        return InstanceID.getInstance(context)
+                .getToken(senderId, GoogleCloudMessaging.INSTANCE_ID_SCOPE, null);
+    }
+
+    private String getSenderId() {
+        return context.getString(R.string.gcm_sender_id);
+    }
 
 }