From 7e1e86ae9e024648d17495843ac0177fab758398 Mon Sep 17 00:00:00 2001 From: Mario Danic Date: Mon, 15 Oct 2018 11:56:39 +0200 Subject: [PATCH] Clean up --- .../java/com/nextcloud/talk/controllers/CallController.java | 3 +-- .../java/com/nextcloud/talk/webrtc/MagicWebSocketInstance.java | 3 --- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/controllers/CallController.java b/app/src/main/java/com/nextcloud/talk/controllers/CallController.java index 2aa3d7ffe..244e91b0d 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/CallController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/CallController.java @@ -76,7 +76,6 @@ import com.nextcloud.talk.models.json.signaling.Signaling; import com.nextcloud.talk.models.json.signaling.SignalingOverall; import com.nextcloud.talk.models.json.signaling.settings.IceServer; import com.nextcloud.talk.models.json.signaling.settings.SignalingSettingsOverall; -import com.nextcloud.talk.models.json.websocket.RoomOverallWebSocketMessage; import com.nextcloud.talk.utils.ApiUtils; import com.nextcloud.talk.utils.MagicFlipView; import com.nextcloud.talk.utils.NotificationUtils; @@ -1183,7 +1182,7 @@ public class CallController extends BaseController { if (webSocketCommunicationEvent.getType().equals("hello")) { callSession = webSocketClient.getSessionId(); webSocketClient.joinRoomWithRoomId(roomToken); - //MagicPeerConnectionWrapper magicPeerConnectionWrapper = alwaysGetPeerConnectionWrapperForSessionId(callSession); + MagicPeerConnectionWrapper magicPeerConnectionWrapper = alwaysGetPeerConnectionWrapperForSessionId(callSession); } else if (webSocketCommunicationEvent.equals("MCUPeerReady")) { } } 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 ea95490c3..59fede255 100644 --- a/app/src/main/java/com/nextcloud/talk/webrtc/MagicWebSocketInstance.java +++ b/app/src/main/java/com/nextcloud/talk/webrtc/MagicWebSocketInstance.java @@ -27,18 +27,15 @@ import com.bluelinelabs.logansquare.LoganSquare; import com.nextcloud.talk.application.NextcloudTalkApplication; import com.nextcloud.talk.events.WebSocketCommunicationEvent; import com.nextcloud.talk.models.database.UserEntity; -import com.nextcloud.talk.models.json.rooms.RoomOverall; import com.nextcloud.talk.models.json.websocket.BaseWebSocketMessage; import com.nextcloud.talk.models.json.websocket.CallOverallWebSocketMessage; import com.nextcloud.talk.models.json.websocket.HelloResponseOverallWebSocketMessage; -import com.nextcloud.talk.models.json.websocket.HelloResponseWebSocketMessage; import com.nextcloud.talk.models.json.websocket.RoomOverallWebSocketMessage; import com.nextcloud.talk.models.json.websocket.RoomWebSocketMessage; import org.greenrobot.eventbus.EventBus; import java.io.IOException; -import java.util.HashMap; import javax.inject.Inject;