From a07b4cf81dd10841f2586eaa7e9a964355ac1694 Mon Sep 17 00:00:00 2001
From: Djorkaeff Alexandre <djorkaeff.unb@gmail.com>
Date: Thu, 20 Aug 2020 11:48:22 -0300
Subject: [PATCH] [FIX] Android crashing on receive a notification (#2415)

---
 .../src/main/java/chat/rocket/reactnative/Ejson.java   | 10 ++++++----
 1 file changed, 6 insertions(+), 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
index 233d5f15b..baf263260 100644
--- 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 class Ejson {
     }
 
     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 "";
     }