fix NPE

1f004394 · Yusuke Iwaki · 1ebd23b0 · 1f004394
Commit 1f004394 authored Dec 13, 2016 by Yusuke Iwaki
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 4 deletions

CurrentUserObserver.java .../rocket/android/service/observer/CurrentUserObserver.java +6 -4

No files found.
--- a/app/src/main/java/chat/rocket/android/service/observer/CurrentUserObserver.java
+++ b/app/src/main/java/chat/rocket/android/service/observer/CurrentUserObserver.java
@@ -59,10 +59,12 @@ public class CurrentUserObserver extends AbstractModelObserver<User> {
    // get and observe Room subscriptions.
    methodCall.getRoomSubscriptions().onSuccess(task -> {
-      Registerable listener = new StreamNotifyUserSubscriptionsChanged(
+      if (listeners != null) {
-          context, hostname, realmHelper, ddpClient, userId);
+        Registerable listener = new StreamNotifyUserSubscriptionsChanged(
-      listener.register();
+            context, hostname, realmHelper, ddpClient, userId);
-      listeners.add(listener);
+        listener.register();
+        listeners.add(listener);
+      }
      return null;
    });