[FIX] Android crashing on receive a notification (#2415)

RocketChat · Aug 20, 2020 · a07b4cf · a07b4cf
1 parent 0c55d15
commit a07b4cf
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/android/app/src/main/java/chat/rocket/reactnative/Ejson.java b/android/app/src/main/java/chat/rocket/reactnative/Ejson.java
@@ -67,15 +67,17 @@ public String getAvatarUri() {
     }
 
     public String token() {
-        if (mmkv != null) {
-            return mmkv.decodeString(TOKEN_KEY.concat(userId()));
+        String userId = userId();
+        if (mmkv != null && userId != null) {
+            return mmkv.decodeString(TOKEN_KEY.concat(userId));
         }
         return "";
     }
 
     public String userId() {
-        if (mmkv != null) {
-            return mmkv.decodeString(TOKEN_KEY.concat(serverURL()));
+        String serverURL = serverURL();
+        if (mmkv != null && serverURL != null) {
+            return mmkv.decodeString(TOKEN_KEY.concat(serverURL));
         }
         return "";
     }