From f1d89ccacb9d736403ddc585f17aafc8faed2ed1 Mon Sep 17 00:00:00 2001
From: Mario Danic <mario@lovelyhq.com>
Date: Tue, 16 Jan 2018 11:14:29 +0100
Subject: [PATCH] Safeguards against null

Signed-off-by: Mario Danic <mario@lovelyhq.com>
---
 .../webrtc/MagicPeerConnectionWrapper.java    | 25 +++++++++++--------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/webrtc/MagicPeerConnectionWrapper.java b/app/src/main/java/com/nextcloud/talk/webrtc/MagicPeerConnectionWrapper.java
index 82e359e9c..c31cc2dd0 100644
--- a/app/src/main/java/com/nextcloud/talk/webrtc/MagicPeerConnectionWrapper.java
+++ b/app/src/main/java/com/nextcloud/talk/webrtc/MagicPeerConnectionWrapper.java
@@ -111,12 +111,13 @@ public class MagicPeerConnectionWrapper {
 
     public void drainIceCandidates() {
 
-        for (IceCandidate iceCandidate : iceCandidates) {
-            peerConnection.addIceCandidate(iceCandidate);
+        if (peerConnection != null) {
+            for (IceCandidate iceCandidate : iceCandidates) {
+                peerConnection.addIceCandidate(iceCandidate);
+            }
+
+            iceCandidates = new ArrayList<>();
         }
-
-        iceCandidates = new ArrayList<>();
-
     }
 
     public MagicSdpObserver getMagicSdpObserver() {
@@ -124,10 +125,12 @@ public class MagicPeerConnectionWrapper {
     }
 
     public void addCandidate(IceCandidate iceCandidate) {
-        if (peerConnection.getRemoteDescription() != null) {
-            peerConnection.addIceCandidate(iceCandidate);
-        } else {
-            iceCandidates.add(iceCandidate);
+        if (peerConnection != null) {
+            if (peerConnection.getRemoteDescription() != null) {
+                peerConnection.addIceCandidate(iceCandidate);
+            } else {
+                iceCandidates.add(iceCandidate);
+            }
         }
     }
 
@@ -338,7 +341,9 @@ public class MagicPeerConnectionWrapper {
 
             EventBus.getDefault().post(new SessionDescriptionSendEvent(sessionDescriptionWithPreferredCodec, sessionId,
                     sessionDescription.type.canonicalForm().toLowerCase(), null));
-            peerConnection.setLocalDescription(magicSdpObserver, sessionDescriptionWithPreferredCodec);
+            if (peerConnection != null) {
+                peerConnection.setLocalDescription(magicSdpObserver, sessionDescriptionWithPreferredCodec);
+            }
         }
 
         @Override