From ba8597900ad2ae6720eb8abfd87899d9dccc2939 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Tue, 23 Jul 2019 09:23:37 -0400
Subject: [PATCH] Fix NPE in MediaSendActivity.

---
 .../thoughtcrime/securesms/mediasend/MediaSendActivity.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java b/src/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java
index 9e44bf7ed8..1afc6f196c 100644
--- a/src/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java
+++ b/src/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java
@@ -439,7 +439,9 @@ public class MediaSendActivity extends PassphraseRequiredActionBarActivity imple
 
   @Override
   public void onRequestFullScreen(boolean fullScreen) {
-    captionAndRail.setVisibility(fullScreen ? View.GONE : View.VISIBLE);
+    if (captionAndRail != null) {
+      captionAndRail.setVisibility(fullScreen ? View.GONE : View.VISIBLE);
+    }
   }
 
   @Override