gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-03-06 14:27:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Better clean up

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2018-01-11 23:04:56 +01:00
parent 5090660068
commit 0e78d0f64d
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -940,7 +940,9 @@ public class CallActivity extends AppCompatActivity {
private void deleteMagicPeerConnection(MagicPeerConnectionWrapper magicPeerConnectionWrapper) { private void deleteMagicPeerConnection(MagicPeerConnectionWrapper magicPeerConnectionWrapper) {
if (magicPeerConnectionWrapper.getPeerConnection() != null) { if (magicPeerConnectionWrapper.getPeerConnection() != null) {
magicPeerConnectionWrapper.removeMediaStream();
magicPeerConnectionWrapper.getPeerConnection().close(); magicPeerConnectionWrapper.getPeerConnection().close();
magicPeerConnectionWrapper.getPeerConnection().dispose();
} }
magicPeerConnectionWrapperList.remove(magicPeerConnectionWrapper); magicPeerConnectionWrapperList.remove(magicPeerConnectionWrapper);
} }
@ -977,7 +979,6 @@ public class CallActivity extends AppCompatActivity {
} }
if (!dueToNetworkChange) { if (!dueToNetworkChange) {
pipVideoView.release(); pipVideoView.release();
@ -989,8 +990,13 @@ public class CallActivity extends AppCompatActivity {
if (localMediaStream.audioTracks != null && localMediaStream.audioTracks.size() > 0) { if (localMediaStream.audioTracks != null && localMediaStream.audioTracks.size() > 0) {
localMediaStream.removeTrack(localMediaStream.audioTracks.get(0)); localMediaStream.removeTrack(localMediaStream.audioTracks.get(0));
} }
localMediaStream.dispose();
} }
localVideoTrack.dispose();
localAudioTrack.dispose();
localVideoTrack = null; localVideoTrack = null;
localAudioTrack = null; localAudioTrack = null;
localRenderer = null; localRenderer = null;

6
app/src/main/java/com/nextcloud/talk/webrtc/MagicPeerConnectionWrapper.java
View File

@ -92,6 +92,12 @@ public class MagicPeerConnectionWrapper {
} }
} }
public void removeMediaStream() {
if (peerConnection != null && localMediaStream != null) {
peerConnection.removeStream(localMediaStream);
}
}
public void drainIceCandidates() { public void drainIceCandidates() {
for (IceCandidate iceCandidate : iceCandidates) { for (IceCandidate iceCandidate : iceCandidates) {