Merge pull request #385 from jpush/dev

Dev
jpush · Oct 20, 2017 · 9cbe3ec · 9cbe3ec
2 parents 40d91a2 + 3cde6fe
commit 9cbe3ec
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/android/src/main/java/cn/jpush/reactnativejpush/JPushModule.java b/android/src/main/java/cn/jpush/reactnativejpush/JPushModule.java
@@ -16,6 +16,7 @@
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.bridge.ReadableMapKeySetIterator;
 import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
@@ -27,6 +28,7 @@
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
@@ -463,8 +465,9 @@ public void sendLocalNotification(ReadableMap map) {
             ln.setContent(map.getString("content"));
             ReadableMap extra = map.getMap("extra");
             JSONObject json = new JSONObject();
-            while (extra.keySetIterator().hasNextKey()) {
-                String key = extra.keySetIterator().nextKey();
+            ReadableMapKeySetIterator iterator = extra.keySetIterator();
+            while (iterator.hasNextKey()) {
+                String key = iterator.nextKey();
                 json.put(key, extra.getString(key));
             }
             ln.setExtras(json.toString());

diff --git a/example/package.json b/example/package.json
@@ -8,7 +8,7 @@
   },
   "dependencies": {
     "jcore-react-native": "^1.1.7",
-    "jpush-react-native": "^2.0.6",
+    "jpush-react-native": "^2.1.1",
     "react": "^16.0.0-alpha.12",
     "react-native": "^0.47.1",
     "react-native-onesignal": "^3.0.4",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jpush-react-native",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "a jpush plugin for react native application",
   "main": "index.js",
   "scripts": {