From 668e8dee5dc2b98cb04ca21eee14657842657aaa Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Fri, 19 Oct 2018 15:57:34 -0700
Subject: [PATCH] Catch more camera exceptions.

Some devices will simply fail to open the camera with a runtime
exception. In this case, all we can do is catch it and report the error.
---
 .../securesms/camera/Camera1Controller.java         | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/org/thoughtcrime/securesms/camera/Camera1Controller.java b/src/org/thoughtcrime/securesms/camera/Camera1Controller.java
index e00a530b41..b5ddc8c723 100644
--- a/src/org/thoughtcrime/securesms/camera/Camera1Controller.java
+++ b/src/org/thoughtcrime/securesms/camera/Camera1Controller.java
@@ -34,9 +34,20 @@ public class Camera1Controller {
 
     if (Camera.getNumberOfCameras() <= 0) {
       onCameraUnavailable();
+      return;
     }
 
-    camera = Camera.open(cameraId);
+    try {
+      camera = Camera.open(cameraId);
+    } catch (Exception e) {
+      onCameraUnavailable();
+      return;
+    }
+
+    if (camera == null) {
+      onCameraUnavailable();
+      return;
+    }
 
     Camera.Parameters  params     = camera.getParameters();
     Camera.Size        maxSize    = getMaxSupportedPreviewSize(camera);