Skip to content

Commit 2657136

Browse files
committed
#147 - Fix possible Null Pointer Exception when logging an event on Android
1 parent cb4a19a commit 2657136

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

android/src/main/java/io/fullstack/firestack/FirestackUtils.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import com.facebook.react.bridge.ReadableType;
2121
import com.google.firebase.database.DataSnapshot;
2222

23+
@SuppressWarnings("WeakerAccess")
2324
public class FirestackUtils {
2425
private static final String TAG = "FirestackUtils";
2526

@@ -168,8 +169,12 @@ public static WritableArray getChildKeys(DataSnapshot snapshot) {
168169
}
169170

170171
public static Map<String, Object> recursivelyDeconstructReadableMap(ReadableMap readableMap) {
171-
ReadableMapKeySetIterator iterator = readableMap.keySetIterator();
172172
Map<String, Object> deconstructedMap = new HashMap<>();
173+
if (readableMap == null) {
174+
return deconstructedMap;
175+
}
176+
177+
ReadableMapKeySetIterator iterator = readableMap.keySetIterator();
173178
while (iterator.hasNextKey()) {
174179
String key = iterator.nextKey();
175180
ReadableType type = readableMap.getType(key);

0 commit comments

Comments
 (0)