|
@@ -1393,6 +1393,7 @@ public class CallActivity extends CallBaseActivity {
|
|
public void onMessageEvent(WebSocketCommunicationEvent webSocketCommunicationEvent) {
|
|
public void onMessageEvent(WebSocketCommunicationEvent webSocketCommunicationEvent) {
|
|
switch (webSocketCommunicationEvent.getType()) {
|
|
switch (webSocketCommunicationEvent.getType()) {
|
|
case "hello":
|
|
case "hello":
|
|
|
|
+ Log.d(TAG, "onMessageEvent 'hello'");
|
|
if (!webSocketCommunicationEvent.getHashMap().containsKey("oldResumeId")) {
|
|
if (!webSocketCommunicationEvent.getHashMap().containsKey("oldResumeId")) {
|
|
if (currentCallStatus.equals(CallStatus.RECONNECTING)) {
|
|
if (currentCallStatus.equals(CallStatus.RECONNECTING)) {
|
|
hangup(false);
|
|
hangup(false);
|
|
@@ -1402,6 +1403,7 @@ public class CallActivity extends CallBaseActivity {
|
|
}
|
|
}
|
|
break;
|
|
break;
|
|
case "roomJoined":
|
|
case "roomJoined":
|
|
|
|
+ Log.d(TAG, "onMessageEvent 'roomJoined'");
|
|
startSendingNick();
|
|
startSendingNick();
|
|
|
|
|
|
if (webSocketCommunicationEvent.getHashMap().get("roomToken").equals(roomToken)) {
|
|
if (webSocketCommunicationEvent.getHashMap().get("roomToken").equals(roomToken)) {
|
|
@@ -1409,6 +1411,7 @@ public class CallActivity extends CallBaseActivity {
|
|
}
|
|
}
|
|
break;
|
|
break;
|
|
case "participantsUpdate":
|
|
case "participantsUpdate":
|
|
|
|
+ Log.d(TAG, "onMessageEvent 'participantsUpdate'");
|
|
if (webSocketCommunicationEvent.getHashMap().get("roomToken").equals(roomToken)) {
|
|
if (webSocketCommunicationEvent.getHashMap().get("roomToken").equals(roomToken)) {
|
|
processUsersInRoom(
|
|
processUsersInRoom(
|
|
(List<HashMap<String, Object>>) webSocketClient
|
|
(List<HashMap<String, Object>>) webSocketClient
|
|
@@ -1417,10 +1420,12 @@ public class CallActivity extends CallBaseActivity {
|
|
}
|
|
}
|
|
break;
|
|
break;
|
|
case "signalingMessage":
|
|
case "signalingMessage":
|
|
|
|
+ Log.d(TAG, "onMessageEvent 'signalingMessage'");
|
|
processMessage((NCSignalingMessage) webSocketClient.getJobWithId(
|
|
processMessage((NCSignalingMessage) webSocketClient.getJobWithId(
|
|
Integer.valueOf(webSocketCommunicationEvent.getHashMap().get("jobId"))));
|
|
Integer.valueOf(webSocketCommunicationEvent.getHashMap().get("jobId"))));
|
|
break;
|
|
break;
|
|
case "peerReadyForRequestingOffer":
|
|
case "peerReadyForRequestingOffer":
|
|
|
|
+ Log.d(TAG, "onMessageEvent 'peerReadyForRequestingOffer'");
|
|
webSocketClient.requestOfferForSessionIdWithType(
|
|
webSocketClient.requestOfferForSessionIdWithType(
|
|
webSocketCommunicationEvent.getHashMap().get("sessionId"), "video");
|
|
webSocketCommunicationEvent.getHashMap().get("sessionId"), "video");
|
|
break;
|
|
break;
|
|
@@ -1578,6 +1583,7 @@ public class CallActivity extends CallBaseActivity {
|
|
}
|
|
}
|
|
|
|
|
|
private void hangupNetworkCalls(boolean shutDownView) {
|
|
private void hangupNetworkCalls(boolean shutDownView) {
|
|
|
|
+ Log.d(TAG, "hangupNetworkCalls. shutDownView=" + shutDownView);
|
|
int apiVersion = ApiUtils.getCallApiVersion(conversationUser, new int[]{ApiUtils.APIv4, 1});
|
|
int apiVersion = ApiUtils.getCallApiVersion(conversationUser, new int[]{ApiUtils.APIv4, 1});
|
|
|
|
|
|
ncApi.leaveCall(credentials, ApiUtils.getUrlForCall(apiVersion, baseUrl, roomToken))
|
|
ncApi.leaveCall(credentials, ApiUtils.getUrlForCall(apiVersion, baseUrl, roomToken))
|
|
@@ -1647,6 +1653,7 @@ public class CallActivity extends CallBaseActivity {
|
|
} else {
|
|
} else {
|
|
Log.d(TAG, " inCallFlag of currentSessionId: " + inCallFlag);
|
|
Log.d(TAG, " inCallFlag of currentSessionId: " + inCallFlag);
|
|
if (inCallFlag == 0){
|
|
if (inCallFlag == 0){
|
|
|
|
+ Log.d(TAG, "Most probably a moderator ended the call for all.");
|
|
hangup(true);
|
|
hangup(true);
|
|
}
|
|
}
|
|
}
|
|
}
|