Change new hostname reselection logic on logout

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

@@ -60,7 +60,7 @@ public class RocketChatCache {
         json = new JSONObject(hostnameList);
       }
       JSONObject serverInfoJson = new JSONObject();
-      serverInfoJson.put("hostname", hostnameAvatarUri);
+      serverInfoJson.put("avatar", hostnameAvatarUri);
       serverInfoJson.put("sitename", siteName);
       // Replace server avatar uri if exists.
       json.put(hostname, hostnameAvatarUri == null ? JSONObject.NULL : serverInfoJson);
@@ -82,7 +82,7 @@ public class RocketChatCache {
         String hostname = iter.next();
         JSONObject serverInfoJson = jsonObj.getJSONObject(hostname);
         serverList.add(new Pair<>(hostname, new Pair<>(
-                "http://" + hostname + "/" + serverInfoJson.getString("hostname"),
+                "http://" + hostname + "/" + serverInfoJson.getString("avatar"),
                 serverInfoJson.getString("sitename"))));
       }
       return serverList;
@@ -100,12 +100,30 @@ public class RocketChatCache {
     try {
       JSONObject jsonObj = new JSONObject(json);
       jsonObj.remove(hostname);
-      setString(KEY_HOSTNAME_LIST, jsonObj.toString());
+      String result = jsonObj.length() == 0 ? null : jsonObj.toString();
+      setString(KEY_HOSTNAME_LIST, result);
     } catch (JSONException e) {
       RCLog.e(e);
     }
   }
 
+  @Nullable
+  public String getFirstLoggedHostnameIfAny() {
+    String json = getString(KEY_HOSTNAME_LIST, null);
+    if (json != null) {
+      try {
+        JSONObject jsonObj = new JSONObject(json);
+        if (jsonObj.length() > 0 && jsonObj.keys().hasNext()) {
+          // Returns the first hostname on the list.
+          return jsonObj.keys().next();
+        }
+      } catch (JSONException e) {
+        RCLog.e(e);
+      }
+    }
+    return null;
+  }
+
   public String getSelectedRoomId() {
     try {
       JSONObject jsonObject = getSelectedRoomIdJsonObject();
@@ -194,7 +212,9 @@ public class RocketChatCache {
     try {
       JSONObject selectedRoomIdJsonObject = getSelectedRoomIdJsonObject();
       selectedRoomIdJsonObject.remove(currentHostname);
-      setString(KEY_SELECTED_ROOM_ID, selectedRoomIdJsonObject.toString());
+      String result = selectedRoomIdJsonObject.length() == 0 ?
+              null : selectedRoomIdJsonObject.toString();
+      setString(KEY_SELECTED_ROOM_ID, result);
     } catch (JSONException e) {
       Logger.report(e);
       RCLog.e(e);

app/src/main/java/chat/rocket/android/activity/MainActivity.java

@@ -329,7 +329,7 @@ public class MainActivity extends AbstractAuthedActivity implements MainContract
   }
 
   @DebugLog
-  public void cleanUpBeforeLogout() {
+  public void beforeLogoutCleanUp() {
     presenter.beforeLogoutCleanUp();
   }
 

app/src/main/java/chat/rocket/android/fragment/sidebar/SidebarMainContract.java

@@ -45,8 +45,8 @@ public interface SidebarMainContract {
 
     void onUserOffline();
 
-    void onLogout(Continuation continuation);
+    void onLogout(Continuation<Void, Object> continuation);
 
-    void cleanUpBeforeLogout();
+    void beforeLogoutCleanUp();
   }
 }
\ No newline at end of file

app/src/main/java/chat/rocket/android/fragment/sidebar/SidebarMainFragment.java

@@ -339,14 +339,14 @@ public class SidebarMainFragment extends AbstractFragment implements SidebarMain
   private void setupLogoutButton() {
     rootView.findViewById(R.id.btn_logout).setOnClickListener(view -> {
       closeUserActionContainer();
+      // Clear relative data and set new hostname if any.
+      presenter.beforeLogoutCleanUp();
       final Activity activity = getActivity();
       if (activity != null && activity instanceof MainActivity) {
         ((MainActivity) activity).showLogoutMessage();
-        // Clear subscriptions.
-        ((MainActivity) activity).cleanUpBeforeLogout();
+        // Clear subscriptions on MainPresenter.
+        ((MainActivity) activity).beforeLogoutCleanUp();
       }
-      // Clear relative data and set new hostname if any.
-      presenter.cleanUpBeforeLogout();
     });
   }
 

app/src/main/java/chat/rocket/android/fragment/sidebar/SidebarMainPresenter.java

@@ -22,7 +22,6 @@ import chat.rocket.android.shared.BasePresenter;
 import chat.rocket.core.interactors.RoomInteractor;
 import chat.rocket.core.models.Room;
 import chat.rocket.core.models.RoomSidebar;
-import chat.rocket.core.models.ServerInfo;
 import chat.rocket.core.models.Spotlight;
 import chat.rocket.core.models.User;
 import chat.rocket.core.repositories.SpotlightRepository;
@@ -139,7 +138,7 @@ public class SidebarMainPresenter extends BasePresenter<SidebarMainContract.View
     }
 
     @Override
-    public void onLogout(Continuation continuation) {
+    public void onLogout(Continuation<Void, Object> continuation) {
         methodCallHelper.logout().continueWith(task -> {
             if (task.isFaulted()) {
                 Logger.report(task.getError());
@@ -150,21 +149,17 @@ public class SidebarMainPresenter extends BasePresenter<SidebarMainContract.View
     }
 
     @Override
-    public void cleanUpBeforeLogout() {
+    public void beforeLogoutCleanUp() {
+        clearSubscriptions();
         String currentHostname = rocketChatCache.getSelectedServerHostname();
         RealmHelper realmHelper = RealmStore.getOrCreate(currentHostname);
         realmHelper.executeTransaction(realm -> {
             realm.deleteAll();
             ConnectivityManagerApi connectivityManagerApi = ConnectivityManager.getInstance(RocketChatApplication.getInstance());
             connectivityManagerApi.removeServer(currentHostname);
-            List<ServerInfo> serverList = connectivityManagerApi.getServerList();
-            String newHostname = null;
-            if (serverList != null && serverList.size() > 0) {
-                newHostname = serverList.get(0).getHostname();
-            }
             rocketChatCache.removeHostname(currentHostname);
             rocketChatCache.removeSelectedRoomId(currentHostname);
-            rocketChatCache.setSelectedServerHostname(newHostname);
+            rocketChatCache.setSelectedServerHostname(rocketChatCache.getFirstLoggedHostnameIfAny());
             view.onLogoutCleanUp();
             return null;
         });

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

@@ -29,11 +29,17 @@ public class RealmLoginServiceConfigurationRepository extends RealmRepository
   public Single<Optional<LoginServiceConfiguration>> getByName(String serviceName) {
     return Single.defer(() -> Flowable.using(
         () -> new Pair<>(RealmStore.getRealm(hostname), Looper.myLooper()),
-        pair -> RxJavaInterop.toV2Flowable(
-            pair.first.where(RealmMeteorLoginServiceConfiguration.class)
-                .equalTo(RealmMeteorLoginServiceConfiguration.SERVICE, serviceName)
-                .findAll()
-                .<RealmResults<RealmMeteorLoginServiceConfiguration>>asObservable()),
+        pair -> {
+          if (pair.first == null) {
+            return Flowable.empty();
+          }
+
+          return RxJavaInterop.toV2Flowable(
+                  pair.first.where(RealmMeteorLoginServiceConfiguration.class)
+                          .equalTo(RealmMeteorLoginServiceConfiguration.SERVICE, serviceName)
+                          .findAll()
+                          .<RealmResults<RealmMeteorLoginServiceConfiguration>>asObservable());
+        },
         pair -> close(pair.first, pair.second)
     )
         .unsubscribeOn(AndroidSchedulers.from(Looper.myLooper()))
@@ -46,10 +52,16 @@ public class RealmLoginServiceConfigurationRepository extends RealmRepository
   public Flowable<List<LoginServiceConfiguration>> getAll() {
     return Flowable.defer(() -> Flowable.using(
         () -> new Pair<>(RealmStore.getRealm(hostname), Looper.myLooper()),
-        pair -> RxJavaInterop
-            .toV2Flowable(pair.first.where(RealmMeteorLoginServiceConfiguration.class)
-                .findAll()
-                .asObservable()),
+        pair -> {
+          if (pair.first == null) {
+            return Flowable.empty();
+          }
+
+          return RxJavaInterop
+                  .toV2Flowable(pair.first.where(RealmMeteorLoginServiceConfiguration.class)
+                          .findAll()
+                          .asObservable());
+        },
         pair -> close(pair.first, pair.second)
     )
         .unsubscribeOn(AndroidSchedulers.from(Looper.myLooper()))

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

@@ -36,11 +36,17 @@ public class RealmMessageRepository extends RealmRepository implements MessageRe
   public Single<Optional<Message>> getById(String messageId) {
     return Single.defer(() -> Flowable.using(
         () -> new Pair<>(RealmStore.getRealm(hostname), Looper.myLooper()),
-        pair -> RxJavaInterop.toV2Flowable(
-            pair.first.where(RealmMessage.class)
-                .equalTo(RealmMessage.ID, messageId)
-                .findAll()
-                .<RealmResults<RealmMessage>>asObservable()),
+        pair -> {
+            if (pair.first == null) {
+              return Flowable.empty();
+            }
+
+            return RxJavaInterop.toV2Flowable(
+              pair.first.where(RealmMessage.class)
+                  .equalTo(RealmMessage.ID, messageId)
+                  .findAll()
+                  .<RealmResults<RealmMessage>>asObservable());
+        },
         pair -> close(pair.first, pair.second)
     )
         .unsubscribeOn(AndroidSchedulers.from(Looper.myLooper()))
@@ -133,11 +139,17 @@ public class RealmMessageRepository extends RealmRepository implements MessageRe
   public Flowable<List<Message>> getAllFrom(Room room) {
     return Flowable.defer(() -> Flowable.using(
         () -> new Pair<>(RealmStore.getRealm(hostname), Looper.myLooper()),
-        pair -> RxJavaInterop.toV2Flowable(pair.first.where(RealmMessage.class)
-            .equalTo(RealmMessage.ROOM_ID, room.getRoomId())
-            .isNotNull(RealmMessage.USER)
-            .findAllSorted(RealmMessage.TIMESTAMP, Sort.DESCENDING)
-            .asObservable()),
+        pair -> {
+          if (pair.first == null) {
+            return Flowable.empty();
+          }
+
+          return RxJavaInterop.toV2Flowable(pair.first.where(RealmMessage.class)
+                  .equalTo(RealmMessage.ROOM_ID, room.getRoomId())
+                  .isNotNull(RealmMessage.USER)
+                  .findAllSorted(RealmMessage.TIMESTAMP, Sort.DESCENDING)
+                  .asObservable());
+        },
         pair -> close(pair.first, pair.second)
     )
         .unsubscribeOn(AndroidSchedulers.from(Looper.myLooper()))
@@ -150,12 +162,18 @@ public class RealmMessageRepository extends RealmRepository implements MessageRe
   public Single<Integer> unreadCountFor(Room room, User user) {
     return Single.defer(() -> Flowable.using(
         () -> new Pair<>(RealmStore.getRealm(hostname), Looper.myLooper()),
-        pair -> RxJavaInterop.toV2Flowable(pair.first.where(RealmMessage.class)
-            .equalTo(RealmMessage.ROOM_ID, room.getId())
-            .greaterThanOrEqualTo(RealmMessage.TIMESTAMP, room.getLastSeen())
-            .notEqualTo(RealmMessage.USER_ID, user.getId())
-            .findAll()
-            .asObservable()),
+        pair -> {
+          if (pair.first == null) {
+            return Flowable.empty();
+          }
+
+          return RxJavaInterop.toV2Flowable(pair.first.where(RealmMessage.class)
+                  .equalTo(RealmMessage.ROOM_ID, room.getId())
+                  .greaterThanOrEqualTo(RealmMessage.TIMESTAMP, room.getLastSeen())
+                  .notEqualTo(RealmMessage.USER_ID, user.getId())
+                  .findAll()
+                  .asObservable());
+        },
         pair -> close(pair.first, pair.second)
     )
         .unsubscribeOn(AndroidSchedulers.from(Looper.myLooper()))

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

@@ -26,11 +26,16 @@ public class RealmPermissionRepository extends RealmRepository implements Permis
   public Single<Optional<Permission>> getById(String id) {
     return Single.defer(() -> Flowable.using(
         () -> new Pair<>(RealmStore.getRealm(hostname), Looper.myLooper()),
-        pair -> RxJavaInterop.toV2Flowable(
-            pair.first.where(RealmPermission.class)
-                .equalTo(RealmPermission.Columns.ID, id)
-                .findAll()
-                .<RealmResults<RealmPermission>>asObservable()),
+        pair -> {
+            if (pair.first == null) {
+                return Flowable.empty();
+            }
+            return RxJavaInterop.toV2Flowable(
+                pair.first.where(RealmPermission.class)
+                    .equalTo(RealmPermission.Columns.ID, id)
+                    .findAll()
+                    .<RealmResults<RealmPermission>>asObservable());
+        },
         pair -> close(pair.first, pair.second)
     )
         .unsubscribeOn(AndroidSchedulers.from(Looper.myLooper()))

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

@@ -27,11 +27,16 @@ public class RealmPublicSettingRepository extends RealmRepository
   public Single<Optional<PublicSetting>> getById(String id) {
     return Single.defer(() -> Flowable.using(
         () -> new Pair<>(RealmStore.getRealm(hostname), Looper.myLooper()),
-        pair -> RxJavaInterop.toV2Flowable(
-            pair.first.where(RealmPublicSetting.class)
-                .equalTo(RealmPublicSetting.ID, id)
-                .findAll()
-                .<RealmResults<RealmPublicSetting>>asObservable()),
+        pair -> {
+            if (pair.first == null) {
+              return Flowable.empty();
+            }
+            return RxJavaInterop.toV2Flowable(
+              pair.first.where(RealmPublicSetting.class)
+                  .equalTo(RealmPublicSetting.ID, id)
+                  .findAll()
+                  .<RealmResults<RealmPublicSetting>>asObservable());
+        },
         pair -> close(pair.first, pair.second)
     )
         .unsubscribeOn(AndroidSchedulers.from(Looper.myLooper()))

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

@@ -34,10 +34,16 @@ public class RealmRoomRepository extends RealmRepository implements RoomReposito
   public Flowable<List<Room>> getAll() {
     return Flowable.defer(() -> Flowable.using(
         () -> new Pair<>(RealmStore.getRealm(hostname), Looper.myLooper()),
-        pair -> RxJavaInterop.toV2Flowable(
-            pair.first.where(RealmRoom.class)
-                .findAll()
-                .asObservable()),
+        pair -> {
+            if (pair.first == null) {
+                return Flowable.empty();
+            }
+
+            return RxJavaInterop.toV2Flowable(
+                    pair.first.where(RealmRoom.class)
+                            .findAll()
+                            .asObservable());
+        },
         pair -> close(pair.first, pair.second)
     )
         .unsubscribeOn(AndroidSchedulers.from(Looper.myLooper()))
@@ -51,6 +57,10 @@ public class RealmRoomRepository extends RealmRepository implements RoomReposito
     return Flowable.defer(() -> Flowable.using(
         () -> new Pair<>(RealmStore.getRealm(hostname), Looper.myLooper()),
         pair -> {
+          if (pair.first == null) {
+            return Flowable.empty();
+          }
+
           RealmRoom realmRoom = pair.first.where(RealmRoom.class)
               .equalTo(RealmRoom.ROOM_ID, roomId)
               .findFirst();
@@ -150,17 +160,22 @@ public class RealmRoomRepository extends RealmRepository implements RoomReposito
   public Flowable<List<Room>> getSortedLikeName(String name, SortDirection direction, int limit) {
     return Flowable.defer(() -> Flowable.using(
         () -> new Pair<>(RealmStore.getRealm(hostname), Looper.myLooper()),
-        pair -> RxJavaInterop.toV2Flowable(
-            pair.first.where(RealmRoom.class)
-                .like(RealmRoom.NAME, "*" + name + "*", Case.INSENSITIVE)
-                .beginGroup()
-                .equalTo(RealmRoom.TYPE, RealmRoom.TYPE_CHANNEL)
-                .or()
-                .equalTo(RealmRoom.TYPE, RealmRoom.TYPE_PRIVATE)
-                .endGroup()
-                .findAllSorted(RealmRoom.NAME,
-                    direction.equals(SortDirection.ASC) ? Sort.ASCENDING : Sort.DESCENDING)
-                .asObservable()),
+        pair -> {
+            if (pair.first == null) {
+                return Flowable.empty();
+            }
+            return RxJavaInterop.toV2Flowable(
+                pair.first.where(RealmRoom.class)
+                    .like(RealmRoom.NAME, "*" + name + "*", Case.INSENSITIVE)
+                    .beginGroup()
+                    .equalTo(RealmRoom.TYPE, RealmRoom.TYPE_CHANNEL)
+                    .or()
+                    .equalTo(RealmRoom.TYPE, RealmRoom.TYPE_PRIVATE)
+                    .endGroup()
+                    .findAllSorted(RealmRoom.NAME,
+                        direction.equals(SortDirection.ASC) ? Sort.ASCENDING : Sort.DESCENDING)
+                    .asObservable());
+        },
         pair -> close(pair.first, pair.second)
     )
         .unsubscribeOn(AndroidSchedulers.from(Looper.myLooper()))
@@ -173,15 +188,20 @@ public class RealmRoomRepository extends RealmRepository implements RoomReposito
   public Flowable<List<Room>> getLatestSeen(int limit) {
     return Flowable.defer(() -> Flowable.using(
         () -> new Pair<>(RealmStore.getRealm(hostname), Looper.myLooper()),
-        pair -> RxJavaInterop.toV2Flowable(
-            pair.first.where(RealmRoom.class)
-                .beginGroup()
-                .equalTo(RealmRoom.TYPE, RealmRoom.TYPE_CHANNEL)
-                .or()
-                .equalTo(RealmRoom.TYPE, RealmRoom.TYPE_PRIVATE)
-                .endGroup()
-                .findAllSorted(RealmRoom.LAST_SEEN, Sort.ASCENDING)
-                .asObservable()),
+        pair -> {
+            if (pair.first == null) {
+                return Flowable.empty();
+            }
+            return RxJavaInterop.toV2Flowable(
+                pair.first.where(RealmRoom.class)
+                    .beginGroup()
+                    .equalTo(RealmRoom.TYPE, RealmRoom.TYPE_CHANNEL)
+                    .or()
+                    .equalTo(RealmRoom.TYPE, RealmRoom.TYPE_PRIVATE)
+                    .endGroup()
+                    .findAllSorted(RealmRoom.LAST_SEEN, Sort.ASCENDING)
+                    .asObservable());
+        },
         pair -> close(pair.first, pair.second)
     )
         .unsubscribeOn(AndroidSchedulers.from(Looper.myLooper()))

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

@@ -29,12 +29,17 @@ public class RealmRoomRoleRepository extends RealmRepository implements RoomRole
   public Single<Optional<RoomRole>> getFor(Room room, User user) {
     return Single.defer(() -> Flowable.using(
         () -> new Pair<>(RealmStore.getRealm(hostname), Looper.myLooper()),
-        pair -> RxJavaInterop.toV2Flowable(
-            pair.first.where(RealmRoomRole.class)
-                .equalTo(RealmRoomRole.Columns.ROOM_ID, room.getId())
-                .equalTo(RealmRoomRole.Columns.USER + "." + RealmUser.ID, user.getId())
-                .findAll()
-                .<RealmResults<RealmRoomRole>>asObservable()),
+        pair -> {
+            if (pair.first == null) {
+                return Flowable.empty();
+            }
+            return RxJavaInterop.toV2Flowable(
+                pair.first.where(RealmRoomRole.class)
+                    .equalTo(RealmRoomRole.Columns.ROOM_ID, room.getId())
+                    .equalTo(RealmRoomRole.Columns.USER + "." + RealmUser.ID, user.getId())
+                    .findAll()
+                    .<RealmResults<RealmRoomRole>>asObservable());
+        },
         pair -> close(pair.first, pair.second)
     )
         .unsubscribeOn(AndroidSchedulers.from(Looper.myLooper()))

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

@@ -26,11 +26,17 @@ public class RealmSessionRepository extends RealmRepository implements SessionRe
   public Flowable<Optional<Session>> getById(int id) {
     return Flowable.defer(() -> Flowable.using(
         () -> new Pair<>(RealmStore.getRealm(hostname), Looper.myLooper()),
-        pair -> RxJavaInterop.toV2Flowable(
-            pair.first.where(RealmSession.class)
-                .equalTo(RealmSession.ID, id)
-                .findAll()
-                .<RealmSession>asObservable()),
+        pair -> {
+          if (pair.first == null) {
+            return Flowable.empty();
+          }
+
+          return RxJavaInterop.toV2Flowable(
+                  pair.first.where(RealmSession.class)
+                          .equalTo(RealmSession.ID, id)
+                          .findAll()
+                          .<RealmSession>asObservable());
+        },
         pair -> close(pair.first, pair.second)
     )
         .unsubscribeOn(AndroidSchedulers.from(Looper.myLooper()))

persistence-realm/src/main/java/chat/rocket/persistence/realm/repositories/RealmSpotlightRepository.kt

@@ -20,7 +20,12 @@ class RealmSpotlightRepository(private val hostname: String) : RealmRepository()
     override fun getSuggestionsFor(term: String, limit: Int): Flowable<List<Spotlight>> {
         return Flowable.defer { Flowable.using<RealmResults<RealmSpotlight>, Pair<Realm, Looper>>({
             Pair(RealmStore.getRealm(hostname), Looper.myLooper())
-        }, { pair -> RxJavaInterop.toV2Flowable<RealmResults<RealmSpotlight>>(pair.first.where(RealmSpotlight::class.java)
+        }, { pair ->
+            if (pair.first == null) {
+                return@using Flowable.empty()
+            }
+
+            return@using RxJavaInterop.toV2Flowable<RealmResults<RealmSpotlight>>(pair.first.where(RealmSpotlight::class.java)
                 .findAllSorted(Columns.TYPE, Sort.DESCENDING)
                 .asObservable())
         }) { pair -> close(pair.first, pair.second) }

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

@@ -29,16 +29,22 @@ public class RealmSpotlightRoomRepository extends RealmRepository implements Spo
   public Flowable<List<SpotlightRoom>> getSuggestionsFor(String name, SortDirection direction, int limit) {
     return Flowable.defer(() -> Flowable.using(
         () -> new Pair<>(RealmStore.getRealm(hostname), Looper.myLooper()),
-        pair -> RxJavaInterop.toV2Flowable(
-            pair.first.where(RealmSpotlightRoom.class)
-                .like(RealmSpotlightRoom.Columns.NAME, "*" + name + "*", Case.INSENSITIVE)
-                .beginGroup()
-                .equalTo(RealmSpotlightRoom.Columns.TYPE, RealmRoom.TYPE_CHANNEL)
-                .or()
-                .equalTo(RealmSpotlightRoom.Columns.TYPE, RealmRoom.TYPE_PRIVATE)
-                .endGroup()
-                .findAllSorted(RealmSpotlightRoom.Columns.NAME, direction.equals(SortDirection.ASC) ? Sort.ASCENDING : Sort.DESCENDING)
-                .asObservable()),
+        pair -> {
+          if (pair.first == null) {
+            return Flowable.empty();
+          }
+
+          return RxJavaInterop.toV2Flowable(
+                  pair.first.where(RealmSpotlightRoom.class)
+                          .like(RealmSpotlightRoom.Columns.NAME, "*" + name + "*", Case.INSENSITIVE)
+                          .beginGroup()
+                          .equalTo(RealmSpotlightRoom.Columns.TYPE, RealmRoom.TYPE_CHANNEL)
+                          .or()
+                          .equalTo(RealmSpotlightRoom.Columns.TYPE, RealmRoom.TYPE_PRIVATE)
+                          .endGroup()
+                          .findAllSorted(RealmSpotlightRoom.Columns.NAME, direction.equals(SortDirection.ASC) ? Sort.ASCENDING : Sort.DESCENDING)
+                          .asObservable());
+        },
         pair -> close(pair.first, pair.second)
     )
         .unsubscribeOn(AndroidSchedulers.from(Looper.myLooper()))

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

@@ -28,20 +28,26 @@ public class RealmSpotlightUserRepository extends RealmRepository implements Spo
   public Flowable<List<SpotlightUser>> getSuggestionsFor(String name, SortDirection direction, int limit) {
     return Flowable.defer(() -> Flowable.using(
         () -> new Pair<>(RealmStore.getRealm(hostname), Looper.myLooper()),
-        pair -> RxJavaInterop.toV2Flowable(
-            pair.first.where(RealmSpotlightUser.class)
-                .beginGroup()
-                .like(RealmSpotlightUser.Columns.USERNAME, "*" + name + "*", Case.INSENSITIVE)
-                .isNull(RealmSpotlightUser.Columns.NAME)
-                .endGroup()
-                .or()
-                .beginGroup()
-                .like(RealmSpotlightUser.Columns.NAME, "*" + name + "*", Case.INSENSITIVE)
-                .isNotNull(RealmSpotlightUser.Columns.USERNAME)
-                .endGroup()
-                .findAllSorted(RealmSpotlightUser.Columns.USERNAME,
-                    direction.equals(SortDirection.ASC) ? Sort.ASCENDING : Sort.DESCENDING)
-                .asObservable()),
+        pair -> {
+          if (pair.first == null) {
+            return Flowable.empty();
+          }
+
+          return RxJavaInterop.toV2Flowable(
+                  pair.first.where(RealmSpotlightUser.class)
+                          .beginGroup()
+                          .like(RealmSpotlightUser.Columns.USERNAME, "*" + name + "*", Case.INSENSITIVE)
+                          .isNull(RealmSpotlightUser.Columns.NAME)
+                          .endGroup()
+                          .or()
+                          .beginGroup()
+                          .like(RealmSpotlightUser.Columns.NAME, "*" + name + "*", Case.INSENSITIVE)
+                          .isNotNull(RealmSpotlightUser.Columns.USERNAME)
+                          .endGroup()
+                          .findAllSorted(RealmSpotlightUser.Columns.USERNAME,
+                                  direction.equals(SortDirection.ASC) ? Sort.ASCENDING : Sort.DESCENDING)
+                          .asObservable());
+        },
         pair -> close(pair.first, pair.second)
     )
         .unsubscribeOn(AndroidSchedulers.from(Looper.myLooper()))

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

@@ -31,10 +31,16 @@ public class RealmUserRepository extends RealmRepository implements UserReposito
     public Flowable<List<User>> getAll() {
         return Flowable.defer(() -> Flowable.using(
                 () -> new Pair<>(RealmStore.getRealm(hostname), Looper.myLooper()),
-                pair -> RxJavaInterop.toV2Flowable(
-                        pair.first.where(RealmUser.class)
-                                .findAll()
-                                .asObservable()),
+                pair -> {
+                    if (pair.first == null) {
+                        return Flowable.empty();
+                    }
+
+                    return RxJavaInterop.toV2Flowable(
+                            pair.first.where(RealmUser.class)
+                                    .findAll()
+                                    .asObservable());
+                },
                 pair -> close(pair.first, pair.second))
                 .unsubscribeOn(AndroidSchedulers.from(Looper.myLooper()))
                 .filter(roomSubscriptions -> roomSubscriptions != null && roomSubscriptions.isLoaded()
@@ -64,6 +70,7 @@ public class RealmUserRepository extends RealmRepository implements UserReposito
                     if (pair.first == null) {
                         return Flowable.empty();
                     }
+
                     return RxJavaInterop.toV2Flowable(
                         pair.first.where(RealmUser.class)
                                 .isNotEmpty(RealmUser.EMAILS)
@@ -95,6 +102,10 @@ public class RealmUserRepository extends RealmRepository implements UserReposito
     }
 
     private Flowable<Optional<RealmUser>> realmQueryUsername(Realm realm, String username) {
+        if (realm == null) {
+            return Flowable.empty();
+        }
+
         RealmUser realmUser = realm.where(RealmUser.class)
                 .equalTo(RealmUser.USERNAME, username)
                 .findFirst();
@@ -123,11 +134,17 @@ public class RealmUserRepository extends RealmRepository implements UserReposito
     private Flowable<RealmResults<RealmUser>> realmGetSortedLikeName(String name) {
         return Flowable.using(
                 () -> new Pair<>(RealmStore.getRealm(hostname), Looper.myLooper()),
-                pair -> RxJavaInterop.toV2Flowable(
-                        pair.first.where(RealmUser.class)
-                                .like(RealmUser.USERNAME, "*" + name + "*", Case.INSENSITIVE)
-                                .findAllSorted(RealmUser.USERNAME, Sort.DESCENDING)
-                                .asObservable()),
+                pair -> {
+                    if (pair.first == null) {
+                        return Flowable.empty();
+                    }
+
+                    return RxJavaInterop.toV2Flowable(
+                            pair.first.where(RealmUser.class)
+                                    .like(RealmUser.USERNAME, "*" + name + "*", Case.INSENSITIVE)
+                                    .findAllSorted(RealmUser.USERNAME, Sort.DESCENDING)
+                                    .asObservable());
+                },
                 pair -> close(pair.first, pair.second));
     }