Skip to content

Commit 7854653

Browse files
committed
Update Android API processApplyJoinGroup
1 parent 8ce0bf5 commit 7854653

File tree

1 file changed

+11
-6
lines changed

1 file changed

+11
-6
lines changed

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

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -105,13 +105,13 @@ public class JMessageModule extends ReactContextBaseJavaModule {
105105

106106
private Context mContext;
107107
private JMessageUtils mJMessageUtils;
108-
private HashMap<String, GroupApprovalEvent> groupApprovalEventHashMap;
108+
private static HashMap<String, GroupApprovalEvent> groupApprovalEventHashMap;
109109

110110
public JMessageModule(ReactApplicationContext reactContext, boolean shutdownToast) {
111111
super(reactContext);
112112
mJMessageUtils = new JMessageUtils(reactContext, shutdownToast);
113113
mContext = reactContext;
114-
groupApprovalEventHashMap = new HashMap<>();
114+
115115
}
116116

117117
@Override
@@ -124,6 +124,13 @@ public boolean canOverrideExistingModule() {
124124
return true;
125125
}
126126

127+
@Override
128+
public void initialize() {
129+
super.initialize();
130+
if(groupApprovalEventHashMap == null)
131+
groupApprovalEventHashMap = new HashMap<>();
132+
}
133+
127134
@ReactMethod
128135
public void setup(ReadableMap map) {
129136
try {
@@ -1870,7 +1877,7 @@ public void processApplyJoinGroup(final ReadableMap map, final Callback success,
18701877
List<GroupApprovalEvent> groupApprovalEventList = new ArrayList<>();
18711878

18721879
for (int i = 0; i < array.size(); i++) {
1873-
GroupApprovalEvent groupApprovalEvent = groupApprovalEventHashMap.remove(array.getString(i));
1880+
GroupApprovalEvent groupApprovalEvent = groupApprovalEventHashMap.get(array.getString(i));
18741881
if (groupApprovalEvent == null) {
18751882
mJMessageUtils.handleError(fail, ERR_CODE_PARAMETER,
18761883
ERR_MSG_PARAMETER + ": can't get event through " + array.getString(i));
@@ -2065,9 +2072,7 @@ public void onEventMainThread(ChatRoomMessageEvent event) {
20652072

20662073
public void onEvent(GroupApprovalEvent event) {
20672074
Log.d(TAG, "GroupApprovalEvent, event: " + event);
2068-
GroupApprovalEvent save_event = new GroupApprovalEvent();
2069-
save_event = event;
2070-
groupApprovalEventHashMap.put(event.getEventId() + "", save_event);
2075+
groupApprovalEventHashMap.put(event.getEventId() + "", event);
20712076
GroupApprovalEvent.Type type = event.getType();
20722077
final WritableMap map = Arguments.createMap();
20732078
map.putString(Constant.EVENT_ID, event.getEventId() + "");

0 commit comments

Comments
 (0)