From 4086499a320cf0ef9d375d6784950980f4b9d34f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Calvi=C3=B1o=20S=C3=A1nchez?= <danxuliu@gmail.com>
Date: Mon, 24 Oct 2022 11:32:10 +0200
Subject: [PATCH] Remove special method to request offers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

As the "requestoffer" message is just a signaling message the generic
method can be used instead.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
---
 .../com/nextcloud/talk/activities/CallActivity.java | 11 +++++++++--
 .../talk/webrtc/MagicWebSocketInstance.java         | 13 -------------
 .../talk/webrtc/WebSocketConnectionHelper.java      | 11 -----------
 3 files changed, 9 insertions(+), 26 deletions(-)

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 e99e65a93..3c300b78a 100644
--- a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
+++ b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
@@ -1616,8 +1616,15 @@ public class CallActivity extends CallBaseActivity {
                 break;
             case "peerReadyForRequestingOffer":
                 Log.d(TAG, "onMessageEvent 'peerReadyForRequestingOffer'");
-                webSocketClient.requestOfferForSessionIdWithType(
-                    webSocketCommunicationEvent.getHashMap().get("sessionId"), "video");
+
+                NCSignalingMessage ncSignalingMessage = new NCSignalingMessage();
+                // "to" property is not actually needed in the "requestoffer" signaling message, but it is used to
+                // set the recipient session ID in the assembled call message.
+                ncSignalingMessage.setTo(webSocketCommunicationEvent.getHashMap().get("sessionId"));
+                ncSignalingMessage.setRoomType("video");
+                ncSignalingMessage.setType("requestoffer");
+
+                webSocketClient.sendCallMessage(ncSignalingMessage);
                 break;
         }
     }
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 3af1353a3..cbc288e6b 100644
--- a/app/src/main/java/com/nextcloud/talk/webrtc/MagicWebSocketInstance.java
+++ b/app/src/main/java/com/nextcloud/talk/webrtc/MagicWebSocketInstance.java
@@ -356,19 +356,6 @@ public class MagicWebSocketInstance extends WebSocketListener {
         }
     }
 
-    public void requestOfferForSessionIdWithType(String sessionIdParam, String roomType) {
-        try {
-            String message = LoganSquare.serialize(webSocketConnectionHelper.getAssembledRequestOfferModel(sessionIdParam, roomType));
-            if (!connected || reconnecting) {
-                messagesQueue.add(message);
-            } else {
-                internalWebSocket.send(message);
-            }
-        } catch (IOException e) {
-            Log.e(TAG, "Failed to offer request. sessionIdParam: " + sessionIdParam + " roomType:" + roomType, e);
-        }
-    }
-
     void sendBye() {
         if (connected) {
             try {
diff --git a/app/src/main/java/com/nextcloud/talk/webrtc/WebSocketConnectionHelper.java b/app/src/main/java/com/nextcloud/talk/webrtc/WebSocketConnectionHelper.java
index 41066e541..096e71b10 100644
--- a/app/src/main/java/com/nextcloud/talk/webrtc/WebSocketConnectionHelper.java
+++ b/app/src/main/java/com/nextcloud/talk/webrtc/WebSocketConnectionHelper.java
@@ -143,17 +143,6 @@ public class WebSocketConnectionHelper {
         return roomOverallWebSocketMessage;
     }
 
-    CallOverallWebSocketMessage getAssembledRequestOfferModel(String sessionId, String roomType) {
-        NCSignalingMessage ncSignalingMessage = new NCSignalingMessage();
-        // "to" property is not actually needed in the "requestoffer" signaling message, but it is used to set the
-        // recipient session ID in the assembled call message.
-        ncSignalingMessage.setTo(sessionId);
-        ncSignalingMessage.setRoomType(roomType);
-        ncSignalingMessage.setType("requestoffer");
-
-        return getAssembledCallMessageModel(ncSignalingMessage);
-    }
-
     CallOverallWebSocketMessage getAssembledCallMessageModel(NCSignalingMessage ncSignalingMessage) {
         CallOverallWebSocketMessage callOverallWebSocketMessage = new CallOverallWebSocketMessage();
         callOverallWebSocketMessage.setType("message");