From 4c0a98d526a85452564be0e22c02234b91b9ab4d Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Fri, 16 Dec 2022 13:23:45 -0400
Subject: [PATCH] Add nullability check to video capture callback.

Fixes #12666
---
 .../securesms/mediasend/CameraXFragment.java  | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraXFragment.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraXFragment.java
index d2a8c80a1..e9ddd9c20 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraXFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraXFragment.java
@@ -2,6 +2,7 @@ package org.thoughtcrime.securesms.mediasend;
 
 import android.animation.Animator;
 import android.annotation.SuppressLint;
+import android.app.Activity;
 import android.content.Context;
 import android.content.pm.ActivityInfo;
 import android.content.res.Configuration;
@@ -448,13 +449,17 @@ public class CameraXFragment extends LoggingFragment implements CameraFragment {
                                                         @NonNull View flipButton,
                                                         @NonNull Animation inAnimation)
   {
-    requireActivity().runOnUiThread(() -> {
-      captureButton.setEnabled(true);
-      flashButton.startAnimation(inAnimation);
-      flashButton.setVisibility(View.VISIBLE);
-      flipButton.startAnimation(inAnimation);
-      flipButton.setVisibility(View.VISIBLE);
-    });
+    Activity activity = getActivity();
+
+    if (activity != null) {
+      activity.runOnUiThread(() -> {
+        captureButton.setEnabled(true);
+        flashButton.startAnimation(inAnimation);
+        flashButton.setVisibility(View.VISIBLE);
+        flipButton.startAnimation(inAnimation);
+        flipButton.setVisibility(View.VISIBLE);
+      });
+    }
   }
 
   private void onCaptureClicked() {