Merge pull request #128 from JoshLipan/dev

Dev

Author: JoshLipan

android/src/io/jchat/android/JMessageModule.java

@@ -105,13 +105,13 @@ public class JMessageModule extends ReactContextBaseJavaModule {
 
     private Context mContext;
     private JMessageUtils mJMessageUtils;
-    private HashMap<String, GroupApprovalEvent> groupApprovalEventHashMap;
+    private static HashMap<String, GroupApprovalEvent> groupApprovalEventHashMap;
 
     public JMessageModule(ReactApplicationContext reactContext, boolean shutdownToast) {
         super(reactContext);
         mJMessageUtils = new JMessageUtils(reactContext, shutdownToast);
         mContext = reactContext;
-        groupApprovalEventHashMap = new HashMap<>();
+
     }
 
     @Override
@@ -124,6 +124,13 @@ public boolean canOverrideExistingModule() {
         return true;
     }
 
+    @Override
+    public void initialize() {
+        super.initialize();
+        if(groupApprovalEventHashMap == null)
+            groupApprovalEventHashMap = new HashMap<>();
+    }
+
     @ReactMethod
     public void setup(ReadableMap map) {
         try {
@@ -1870,7 +1877,7 @@ public void processApplyJoinGroup(final ReadableMap map, final Callback success,
             List<GroupApprovalEvent> groupApprovalEventList = new ArrayList<>();
 
             for (int i = 0; i < array.size(); i++) {
-                GroupApprovalEvent groupApprovalEvent = groupApprovalEventHashMap.remove(array.getString(i));
+                GroupApprovalEvent groupApprovalEvent = groupApprovalEventHashMap.get(array.getString(i));
                 if (groupApprovalEvent == null) {
                     mJMessageUtils.handleError(fail, ERR_CODE_PARAMETER,
                             ERR_MSG_PARAMETER + ": can't get event through " + array.getString(i));
@@ -2065,9 +2072,7 @@ public void onEventMainThread(ChatRoomMessageEvent event) {
 
     public void onEvent(GroupApprovalEvent event) {
         Log.d(TAG, "GroupApprovalEvent, event: " + event);
-        GroupApprovalEvent save_event = new GroupApprovalEvent();
-        save_event = event;
-        groupApprovalEventHashMap.put(event.getEventId() + "", save_event);
+        groupApprovalEventHashMap.put(event.getEventId() + "", event);
         GroupApprovalEvent.Type type = event.getType();
         final WritableMap map = Arguments.createMap();
         map.putString(Constant.EVENT_ID, event.getEventId() + "");

package.json

@@ -1,6 +1,6 @@
 {
   "name": "jmessage-react-plugin",
-  "version": "2.5.0",
+  "version": "2.5.1",
   "description": "a jmessage plugin for react native application",
   "main": "index.js",
   "repository": {