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

Safeguards against null

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2018-01-16 11:14:29 +01:00
parent 02c115d49b
commit f1d89ccacb
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -111,12 +111,13 @@ public class MagicPeerConnectionWrapper {
public void drainIceCandidates() { public void drainIceCandidates() {
for (IceCandidate iceCandidate : iceCandidates) { if (peerConnection != null) {
peerConnection.addIceCandidate(iceCandidate); for (IceCandidate iceCandidate : iceCandidates) {
peerConnection.addIceCandidate(iceCandidate);
}
iceCandidates = new ArrayList<>();
} }
iceCandidates = new ArrayList<>();
} }
public MagicSdpObserver getMagicSdpObserver() { public MagicSdpObserver getMagicSdpObserver() {
@ -124,10 +125,12 @@ public class MagicPeerConnectionWrapper {
} }
public void addCandidate(IceCandidate iceCandidate) { public void addCandidate(IceCandidate iceCandidate) {
if (peerConnection.getRemoteDescription() != null) { if (peerConnection != null) {
peerConnection.addIceCandidate(iceCandidate); if (peerConnection.getRemoteDescription() != null) {
} else { peerConnection.addIceCandidate(iceCandidate);
iceCandidates.add(iceCandidate); } else {
iceCandidates.add(iceCandidate);
}
} }
} }
@ -338,7 +341,9 @@ public class MagicPeerConnectionWrapper {
EventBus.getDefault().post(new SessionDescriptionSendEvent(sessionDescriptionWithPreferredCodec, sessionId, EventBus.getDefault().post(new SessionDescriptionSendEvent(sessionDescriptionWithPreferredCodec, sessionId,
sessionDescription.type.canonicalForm().toLowerCase(), null)); sessionDescription.type.canonicalForm().toLowerCase(), null));
peerConnection.setLocalDescription(magicSdpObserver, sessionDescriptionWithPreferredCodec); if (peerConnection != null) {
peerConnection.setLocalDescription(magicSdpObserver, sessionDescriptionWithPreferredCodec);
}
} }
@Override @Override