gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-07-10 22:34:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Do not handle connection state changes to "closed"

Browse Source 
The connection state changes to "closed" only when the connection is
closed. However, closing a connection does not fire any event (not even
the "iceConnectionStateChanged" event), so the event handler can be
removed as it will never be executed.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
This commit is contained in:
Daniel Calviño Sánchez 2022-11-28 09:12:27 +01:00 committed by Marcel Hibbe (Rebase PR Action)
parent 534bbddc88
commit 6728e3f063
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1971,7 +1971,7 @@ public class CallActivity extends CallBaseActivity {
peerConnectionWrapperList.add(peerConnectionWrapper); peerConnectionWrapperList.add(peerConnectionWrapper);
PeerConnectionWrapper.PeerConnectionObserver peerConnectionObserver = PeerConnectionWrapper.PeerConnectionObserver peerConnectionObserver =
new CallActivityPeerConnectionObserver(sessionId, type); new CallActivityPeerConnectionObserver(sessionId);
peerConnectionObservers.put(sessionId + "-" + type, peerConnectionObserver); peerConnectionObservers.put(sessionId + "-" + type, peerConnectionObserver);
peerConnectionWrapper.addObserver(peerConnectionObserver); peerConnectionWrapper.addObserver(peerConnectionObserver);
@ -2566,11 +2566,9 @@ public class CallActivity extends CallBaseActivity {
private class CallActivityPeerConnectionObserver implements PeerConnectionWrapper.PeerConnectionObserver { private class CallActivityPeerConnectionObserver implements PeerConnectionWrapper.PeerConnectionObserver {
private final String sessionId; private final String sessionId;
private final String videoStreamType;
private CallActivityPeerConnectionObserver(String sessionId, String videoStreamType) { private CallActivityPeerConnectionObserver(String sessionId) {
this.sessionId = sessionId; this.sessionId = sessionId;
this.videoStreamType = videoStreamType;
} }
@Override @Override
@ -2588,12 +2586,6 @@ public class CallActivity extends CallBaseActivity {
updateSelfVideoViewIceConnectionState(iceConnectionState); updateSelfVideoViewIceConnectionState(iceConnectionState);
} }
if (iceConnectionState == PeerConnection.IceConnectionState.CLOSED) {
endPeerConnection(sessionId, VIDEO_STREAM_TYPE_SCREEN.equals(videoStreamType));
return;
}
if (iceConnectionState == PeerConnection.IceConnectionState.FAILED) { if (iceConnectionState == PeerConnection.IceConnectionState.FAILED) {
if (webSocketClient != null && webSocketClient.getSessionId() != null && webSocketClient.getSessionId().equals(sessionId)) { if (webSocketClient != null && webSocketClient.getSessionId() != null && webSocketClient.getSessionId().equals(sessionId)) {
setCallState(CallStatus.PUBLISHER_FAILED); setCallState(CallStatus.PUBLISHER_FAILED);