From 5a3f199f14c3430fc416e4a55dc0e7ad7efc2ae1 Mon Sep 17 00:00:00 2001 From: Mario Danic Date: Tue, 16 Oct 2018 22:01:32 +0200 Subject: [PATCH] Fix a bug with re-sending messages --- .../nextcloud/talk/webrtc/MagicWebSocketInstance.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/webrtc/MagicWebSocketInstance.java b/app/src/main/java/com/nextcloud/talk/webrtc/MagicWebSocketInstance.java index 883fd3199..98e3299fc 100644 --- a/app/src/main/java/com/nextcloud/talk/webrtc/MagicWebSocketInstance.java +++ b/app/src/main/java/com/nextcloud/talk/webrtc/MagicWebSocketInstance.java @@ -40,9 +40,6 @@ import org.greenrobot.eventbus.EventBus; import java.io.IOException; import java.util.HashMap; import java.util.Map; -import java.util.Random; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.CopyOnWriteArrayList; import javax.inject.Inject; @@ -72,7 +69,7 @@ public class MagicWebSocketInstance extends WebSocketListener { private boolean connected; private WebSocketConnectionHelper webSocketConnectionHelper; private WebSocket webSocket; - private MagicMap magicMap; + private MagicMap magicMap; MagicWebSocketInstance(UserEntity conversationUser, String connectionUrl, String webSocketTicket) { NextcloudTalkApplication.getSharedApplication().getComponentApplication().inject(this); @@ -215,8 +212,8 @@ public class MagicWebSocketInstance extends WebSocketListener { } public Object getJobWithId(Integer id) { - Object copyJob = concurrentHashMapQueue.get(id); - concurrentHashMapQueue.remove(id); + Object copyJob = magicMap.get(id); + magicMap.remove(id); return copyJob; }