gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-20 12:09:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix cleanups

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2018-01-12 16:14:36 +01:00
parent 7c76fff135
commit d54a46f62f
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -784,7 +784,8 @@ public class CallActivity extends AppCompatActivity {
try { try {
receivedSignalingMessage(signalingOverall.getOcs().getSignalings().get(i)); receivedSignalingMessage(signalingOverall.getOcs().getSignalings().get(i));
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); Log.e(TAG, "Filed to process received signaling " +
"message");
} }
} }
} }
@ -792,7 +793,6 @@ public class CallActivity extends AppCompatActivity {
@Override @Override
public void onError(Throwable e) { public void onError(Throwable e) {
Log.d("MARIO_DEBUG", e.getLocalizedMessage());
dispose(signalingDisposable); dispose(signalingDisposable);
} }
@ -939,7 +939,7 @@ public class CallActivity extends AppCompatActivity {
private void deleteMagicPeerConnection(MagicPeerConnectionWrapper magicPeerConnectionWrapper) { private void deleteMagicPeerConnection(MagicPeerConnectionWrapper magicPeerConnectionWrapper) {
magicPeerConnectionWrapper.removePeerConnection(magicPeerConnectionWrapperList.size() == 1); magicPeerConnectionWrapper.removePeerConnection();
magicPeerConnectionWrapperList.remove(magicPeerConnectionWrapper); magicPeerConnectionWrapperList.remove(magicPeerConnectionWrapper);
} }

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

@ -92,13 +92,9 @@ public class MagicPeerConnectionWrapper {
} }
} }
public void removePeerConnection(boolean isFinal) { public void removePeerConnection() {
if (peerConnection != null && localMediaStream != null) { if (peerConnection != null) {
peerConnection.close(); peerConnection.close();
peerConnection.removeStream(localMediaStream);
if (isFinal) {
peerConnection.dispose();
}
peerConnection = null; peerConnection = null;
} }
} }