From 151e2e5203b69986837346d8fe4936bcbf7f3168 Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Tue, 9 Nov 2021 09:16:09 -0400
Subject: [PATCH] Increase logging around camera errors, skip toast if context
 is null.

---
 .../thoughtcrime/securesms/mediasend/CameraXFragment.java | 2 ++
 .../mediasend/v2/capture/MediaCaptureFragment.kt          | 8 +++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

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 d41d7900bc..f87ee0521b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraXFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraXFragment.java
@@ -403,6 +403,7 @@ public class CameraXFragment extends LoggingFragment implements CameraFragment {
           try {
             return CameraXUtil.toJpeg(image, camera.getCameraLensFacing() == CameraSelector.LENS_FACING_FRONT);
           } catch (IOException e) {
+            Log.w(TAG, "Failed to encode captured image.", e);
             return null;
           } finally {
             image.close();
@@ -421,6 +422,7 @@ public class CameraXFragment extends LoggingFragment implements CameraFragment {
 
       @Override
       public void onError(ImageCaptureException exception) {
+        Log.w(TAG, "Failed to capture image", exception);
         flashHelper.endFlash();
         controller.onCameraError();
       }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/capture/MediaCaptureFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/capture/MediaCaptureFragment.kt
index d625d887da..d48c18e0c7 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/capture/MediaCaptureFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/capture/MediaCaptureFragment.kt
@@ -99,7 +99,13 @@ class MediaCaptureFragment : Fragment(R.layout.fragment_container), CameraFragme
 
   override fun onCameraError() {
     Log.w(TAG, "Camera Error.")
-    Toast.makeText(requireContext(), R.string.MediaSendActivity_camera_unavailable, Toast.LENGTH_SHORT).show()
+
+    val context = this.context
+    if (context != null) {
+      Toast.makeText(context, R.string.MediaSendActivity_camera_unavailable, Toast.LENGTH_SHORT).show()
+    } else {
+      Log.w(TAG, "Could not post toast, fragment not attached to a context.")
+    }
   }
 
   override fun onImageCaptured(data: ByteArray, width: Int, height: Int) {