Handle converting maps that are null or empty

TheWidlarzGroup · Jun 23, 2018 · bb2b3eb · bb2b3eb
1 parent c67dd7b
commit bb2b3eb
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/android/src/main/java/com/brentvatne/react/ReactVideoView.java b/android/src/main/java/com/brentvatne/react/ReactVideoView.java
@@ -641,14 +641,11 @@ public void onHostDestroy() {
      * @see 'Adapted from https://github.com/artemyarulin/react-native-eval/blob/master/android/src/main/java/com/evaluator/react/ConversionUtil.java'
      */
     public static Map<String, String> toStringMap(@Nullable ReadableMap readableMap) {
+        Map<String, String> result = new HashMap<>();
         if (readableMap == null)
-            return null;
+            return result;
 
         com.facebook.react.bridge.ReadableMapKeySetIterator iterator = readableMap.keySetIterator();
-        if (!iterator.hasNextKey())
-            return null;
-
-        Map<String, String> result = new HashMap<>();
         while (iterator.hasNextKey()) {
             String key = iterator.nextKey();
             result.put(key, readableMap.getString(key));