gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-03-12 02:19:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove special method to request offers

Browse Source 
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>
This commit is contained in:
Daniel Calviño Sánchez 2022-10-24 11:32:10 +02:00 committed by Marcel Hibbe
parent 37db855170
commit 4086499a32
No known key found for this signature in database
GPG Key ID: C793F8B59F43CE7B
3 changed files with 9 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
View File

@ -1616,8 +1616,15 @@ public class CallActivity extends CallBaseActivity {
break; break;
case "peerReadyForRequestingOffer": case "peerReadyForRequestingOffer":
Log.d(TAG, "onMessageEvent '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; break;
} }
} }

13
app/src/main/java/com/nextcloud/talk/webrtc/MagicWebSocketInstance.java
View File

@ -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() { void sendBye() {
if (connected) { if (connected) {
try { try {

11
app/src/main/java/com/nextcloud/talk/webrtc/WebSocketConnectionHelper.java
View File

@ -143,17 +143,6 @@ public class WebSocketConnectionHelper {
return roomOverallWebSocketMessage; 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 getAssembledCallMessageModel(NCSignalingMessage ncSignalingMessage) {
CallOverallWebSocketMessage callOverallWebSocketMessage = new CallOverallWebSocketMessage(); CallOverallWebSocketMessage callOverallWebSocketMessage = new CallOverallWebSocketMessage();
callOverallWebSocketMessage.setType("message"); callOverallWebSocketMessage.setType("message");