mirror of
https://github.com/nextcloud/talk-android
synced 2025-06-20 12:09:45 +01:00
Merge pull request #2392 from nextcloud/fix-disposing-local-stream-when-the-call-activity-is-not-being-left
Fix disposing local stream when the call activity is not being left
This commit is contained in:
commit
5bbd26028f
@ -1167,6 +1167,14 @@ public class CallActivity extends CallBaseActivity {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onDestroy() {
|
public void onDestroy() {
|
||||||
|
if (localStream != null) {
|
||||||
|
localStream.dispose();
|
||||||
|
localStream = null;
|
||||||
|
Log.d(TAG, "Disposed localStream");
|
||||||
|
} else {
|
||||||
|
Log.d(TAG, "localStream is null");
|
||||||
|
}
|
||||||
|
|
||||||
if (!currentCallStatus.equals(CallStatus.LEAVING)) {
|
if (!currentCallStatus.equals(CallStatus.LEAVING)) {
|
||||||
hangup(true);
|
hangup(true);
|
||||||
}
|
}
|
||||||
@ -1722,14 +1730,6 @@ public class CallActivity extends CallBaseActivity {
|
|||||||
endPeerConnection(sessionId, false);
|
endPeerConnection(sessionId, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (localStream != null) {
|
|
||||||
localStream.dispose();
|
|
||||||
localStream = null;
|
|
||||||
Log.d(TAG, "Disposed localStream");
|
|
||||||
} else {
|
|
||||||
Log.d(TAG, "localStream is null");
|
|
||||||
}
|
|
||||||
|
|
||||||
hangupNetworkCalls(shutDownView);
|
hangupNetworkCalls(shutDownView);
|
||||||
ApplicationWideCurrentRoomHolder.getInstance().setInCall(false);
|
ApplicationWideCurrentRoomHolder.getInstance().setInCall(false);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user