From 4173efbe5a42d80dda54b77a0f021191f55f2122 Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Mon, 16 Dec 2019 11:01:32 -0400
Subject: [PATCH] Fix NPE on call initalization

---
 .../components/webrtc/WebRtcCallScreen.java          | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/org/thoughtcrime/securesms/components/webrtc/WebRtcCallScreen.java b/src/org/thoughtcrime/securesms/components/webrtc/WebRtcCallScreen.java
index 4f5631ced0..589a795fbb 100644
--- a/src/org/thoughtcrime/securesms/components/webrtc/WebRtcCallScreen.java
+++ b/src/org/thoughtcrime/securesms/components/webrtc/WebRtcCallScreen.java
@@ -205,6 +205,8 @@ public class WebRtcCallScreen extends FrameLayout implements RecipientForeverObs
 
     localRenderer.setMirror(cameraState.getActiveDirection() == CameraState.Direction.FRONT);
 
+    this.localRenderer = localRenderer;
+
     if (localRenderLayout.getChildCount() != 0) {
       displayLocalRendererInSmallLayout(!cameraState.isEnabled());
     } else {
@@ -238,7 +240,10 @@ public class WebRtcCallScreen extends FrameLayout implements RecipientForeverObs
   private void displayLocalRendererInLargeLayout(boolean hide) {
     if (localLargeRenderLayout.getChildCount() == 0) {
       localRenderLayout.removeAllViews();
-      localLargeRenderLayout.addView(localRenderer);
+
+      if (localRenderer != null) {
+        localLargeRenderLayout.addView(localRenderer);
+      }
     }
 
     localRenderLayout.setHidden(true);
@@ -257,7 +262,10 @@ public class WebRtcCallScreen extends FrameLayout implements RecipientForeverObs
   private void displayLocalRendererInSmallLayout(boolean hide) {
     if (localRenderLayout.getChildCount() == 0) {
       localLargeRenderLayout.removeAllViews();
-      localRenderLayout.addView(localRenderer);
+
+      if (localRenderer != null) {
+        localRenderLayout.addView(localRenderer);
+      }
     }
 
     localLargeRenderLayout.setHidden(true);