Merge pull request #677 from RocketChat/fixes

Fix crash when caching username and login failure when LDAP_Enable setting doesn't exist

app/src/main/java/chat/rocket/android/RocketChatCache.kt

@@ -408,7 +408,11 @@ object RocketChatCache {
         }, BackpressureStrategy.LATEST)
     }
 
-    fun setUserId(userId: String) = setString(KEY_USER_ID, userId)
+    fun setUserId(userId: String?) {
+        userId?.let {
+            setString(KEY_USER_ID, userId)
+        }
+    }
 
     fun getUserId(): String? = getString(KEY_USER_ID, null)
 
@@ -420,7 +424,11 @@ object RocketChatCache {
 
     fun getUserName(): String? = getString(KEY_USER_NAME, null)
 
-    fun setUserUsername(username: String) = setString(KEY_USER_USERNAME, username)
+    fun setUserUsername(username: String?) {
+        username?.let {
+            setString(KEY_USER_USERNAME, username)
+        }
+    }
 
     fun getUserUsername(): String? = getString(KEY_USER_USERNAME, null)
 }
\ No newline at end of file

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

@@ -57,11 +57,14 @@ public class CurrentUserObserver extends AbstractModelObserver<RealmUser> {
         }
         listeners = new ArrayList<>();
 
-    RocketChatCache.INSTANCE.setUserId(user.getId());
-    RocketChatCache.INSTANCE.setUserUsername(user.getUsername());
-    RocketChatCache.INSTANCE.setUserName(user.getName());
+        String userId = user.getId();
+        String username = user.getUsername();
+        String name = user.getName();
 
-    final String userId = user.getId();
+
+        RocketChatCache.INSTANCE.setUserId(userId);
+        RocketChatCache.INSTANCE.setUserUsername(username);
+        RocketChatCache.INSTANCE.setUserName(name);
 
         // get and observe Room subscriptions.
         methodCall.getRoomSubscriptions().onSuccess(task -> {

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

@@ -65,7 +65,10 @@ public class GcmPushRegistrationObserver extends AbstractModelObserver<GcmPushRe
         ).continueWith(task -> {
             if (task.isFaulted()) {
                 realmHelper.executeTransaction(realm -> {
-                    GcmPushRegistration.queryDefault(realm).findFirst().setSyncState(SyncState.FAILED);
+                    GcmPushRegistration gcmPushRegistration = GcmPushRegistration.queryDefault(realm).findFirst();
+                    if (gcmPushRegistration != null) {
+                        gcmPushRegistration.setSyncState(SyncState.FAILED);
+                    }
                     return null;
                 }).continueWith(new LogIfError());
             }

persistence-realm/src/main/java/chat/rocket/persistence/realm/repositories/RealmPublicSettingRepository.java

@@ -31,6 +31,7 @@ public class RealmPublicSettingRepository extends RealmRepository
                     if (pair.first == null) {
                         return Flowable.empty();
                     }
+
                     return pair.first.where(RealmPublicSetting.class)
                             .equalTo(RealmPublicSetting.ID, id)
                             .findAll()
@@ -39,8 +40,21 @@ public class RealmPublicSettingRepository extends RealmRepository
                 pair -> close(pair.first, pair.second)
         )
                 .unsubscribeOn(AndroidSchedulers.from(Looper.myLooper()))
-        .filter(it -> it.isLoaded() && it.isValid() && it.size() > 0)
-        .map(it -> Optional.of(it.get(0).asPublicSetting()))
+                .filter(it -> it.isLoaded() && it.isValid())
+                .map(it -> getPublicSettingOrDefault(id, it))
                 .first(Optional.absent()));
     }
+
+    private Optional<PublicSetting> getPublicSettingOrDefault(String id, RealmResults<RealmPublicSetting> results) {
+        if (results.size() > 0) {
+            return Optional.of(results.get(0).asPublicSetting());
+        }
+
+        PublicSetting defaultSetting = PublicSetting.builder()
+                .setId(id)
+                .setValue("")
+                .setUpdatedAt(0L)
+                .build();
+        return Optional.of(defaultSetting);
+    }
 }