From c4c64df5a6a9b84010f0cbbfc54caa0563b6b9cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Calvi=C3=B1o=20S=C3=A1nchez?= Date: Sat, 22 Oct 2022 03:09:55 +0200 Subject: [PATCH] Remove no longer needed code after removing EventBus message MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel Calviño Sánchez --- .../talk/activities/CallActivity.java | 5 --- .../java/com/nextcloud/talk/utils/MagicMap.kt | 31 ------------------- .../com/nextcloud/talk/webrtc/Globals.java | 11 ------- .../talk/webrtc/MagicWebSocketInstance.java | 17 ---------- 4 files changed, 64 deletions(-) delete mode 100644 app/src/main/java/com/nextcloud/talk/utils/MagicMap.kt diff --git a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java index ac2fbda92..a56a9a09e 100644 --- a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java +++ b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java @@ -173,11 +173,6 @@ import static com.nextcloud.talk.utils.bundle.BundleKeys.KEY_PARTICIPANT_PERMISS import static com.nextcloud.talk.utils.bundle.BundleKeys.KEY_ROOM_ID; import static com.nextcloud.talk.utils.bundle.BundleKeys.KEY_ROOM_TOKEN; import static com.nextcloud.talk.utils.bundle.BundleKeys.KEY_USER_ENTITY; -import static com.nextcloud.talk.webrtc.Globals.JOB_ID; -import static com.nextcloud.talk.webrtc.Globals.PARTICIPANTS_UPDATE; -import static com.nextcloud.talk.webrtc.Globals.ROOM_TOKEN; -import static com.nextcloud.talk.webrtc.Globals.UPDATE_ALL; -import static com.nextcloud.talk.webrtc.Globals.UPDATE_IN_CALL; @AutoInjector(NextcloudTalkApplication.class) public class CallActivity extends CallBaseActivity { diff --git a/app/src/main/java/com/nextcloud/talk/utils/MagicMap.kt b/app/src/main/java/com/nextcloud/talk/utils/MagicMap.kt deleted file mode 100644 index b0ae58039..000000000 --- a/app/src/main/java/com/nextcloud/talk/utils/MagicMap.kt +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Nextcloud Talk application - * - * @author Mario Danic - * Copyright (C) 2017-2018 Mario Danic - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.nextcloud.talk.utils - -import java.util.concurrent.ConcurrentHashMap - -class MagicMap : ConcurrentHashMap() { - fun add(element: Any): Int { - val key = System.identityHashCode(element) - super.put(key, element) - return key - } -} diff --git a/app/src/main/java/com/nextcloud/talk/webrtc/Globals.java b/app/src/main/java/com/nextcloud/talk/webrtc/Globals.java index 8d74fb920..5e27542ee 100644 --- a/app/src/main/java/com/nextcloud/talk/webrtc/Globals.java +++ b/app/src/main/java/com/nextcloud/talk/webrtc/Globals.java @@ -2,17 +2,6 @@ package com.nextcloud.talk.webrtc; public class Globals { public static final String ROOM_TOKEN = "roomToken"; - public static final String JOB_ID = "jobId"; - - public static final String PARTICIPANTS_UPDATE = "participantsUpdate"; public static final String TARGET_PARTICIPANTS = "participants"; - - public static final String EVENT_TYPE = "type"; - public static final String EVENT_TYPE_UPDATE = "update"; - - public static final String UPDATE_ALL = "all"; - public static final String UPDATE_IN_CALL = "incall"; - public static final String UPDATE_ROOM_ID = "roomid"; - public static final String UPDATE_USERS = "users"; } 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 3c6bd9cc2..733c34df2 100644 --- a/app/src/main/java/com/nextcloud/talk/webrtc/MagicWebSocketInstance.java +++ b/app/src/main/java/com/nextcloud/talk/webrtc/MagicWebSocketInstance.java @@ -41,7 +41,6 @@ import com.nextcloud.talk.models.json.websocket.EventOverallWebSocketMessage; import com.nextcloud.talk.models.json.websocket.HelloResponseOverallWebSocketMessage; import com.nextcloud.talk.models.json.websocket.JoinedRoomOverallWebSocketMessage; import com.nextcloud.talk.signaling.SignalingMessageReceiver; -import com.nextcloud.talk.utils.MagicMap; import com.nextcloud.talk.utils.bundle.BundleKeys; import org.greenrobot.eventbus.EventBus; @@ -66,16 +65,8 @@ import okio.ByteString; import static com.nextcloud.talk.models.json.participants.Participant.ActorType.GUESTS; import static com.nextcloud.talk.models.json.participants.Participant.ActorType.USERS; -import static com.nextcloud.talk.webrtc.Globals.EVENT_TYPE; -import static com.nextcloud.talk.webrtc.Globals.EVENT_TYPE_UPDATE; -import static com.nextcloud.talk.webrtc.Globals.JOB_ID; -import static com.nextcloud.talk.webrtc.Globals.PARTICIPANTS_UPDATE; import static com.nextcloud.talk.webrtc.Globals.ROOM_TOKEN; import static com.nextcloud.talk.webrtc.Globals.TARGET_PARTICIPANTS; -import static com.nextcloud.talk.webrtc.Globals.UPDATE_ALL; -import static com.nextcloud.talk.webrtc.Globals.UPDATE_IN_CALL; -import static com.nextcloud.talk.webrtc.Globals.UPDATE_ROOM_ID; -import static com.nextcloud.talk.webrtc.Globals.UPDATE_USERS; @AutoInjector(NextcloudTalkApplication.class) public class MagicWebSocketInstance extends WebSocketListener { @@ -99,7 +90,6 @@ public class MagicWebSocketInstance extends WebSocketListener { private boolean connected; private WebSocketConnectionHelper webSocketConnectionHelper; private WebSocket internalWebSocket; - private MagicMap magicMap; private String connectionUrl; private String currentRoomToken; @@ -120,7 +110,6 @@ public class MagicWebSocketInstance extends WebSocketListener { this.webSocketTicket = webSocketTicket; this.webSocketConnectionHelper = new WebSocketConnectionHelper(); this.usersHashMap = new HashMap<>(); - magicMap = new MagicMap(); connected = false; eventBus.register(this); @@ -368,12 +357,6 @@ public class MagicWebSocketInstance extends WebSocketListener { } } - public Object getJobWithId(Integer id) { - Object copyJob = magicMap.get(id); - magicMap.remove(id); - return copyJob; - } - public void requestOfferForSessionIdWithType(String sessionIdParam, String roomType) { try { String message = LoganSquare.serialize(webSocketConnectionHelper.getAssembledRequestOfferModel(sessionIdParam, roomType));