Make safer calls on Android

xDemon200 · Aug 29, 2017 · 4e04e34 · 4e04e34
1 parent 1bcf857
commit 4e04e34
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/android/src/main/java/com/lwansbrough/RCTCamera/RCTCameraModule.java b/android/src/main/java/com/lwansbrough/RCTCamera/RCTCameraModule.java
@@ -660,13 +660,23 @@ public void stopCapture(final Promise promise) {
 
     @ReactMethod
     public void stopPreview(ReadableMap options) {
-        Camera camera = RCTCamera.getInstance().acquireCameraInstance(options.getInt("type"));
+        RCTCamera instance = RCTCamera.getInstance();
+        if (instance == null) return;
+
+        Camera camera = instance.acquireCameraInstance(options.getInt("type"));
+        if (camera == null) return;
+
         camera.stopPreview();
     }
 
     @ReactMethod
     public void startPreview(ReadableMap options) {
-        Camera camera = RCTCamera.getInstance().acquireCameraInstance(options.getInt("type"));
+        RCTCamera instance = RCTCamera.getInstance();
+        if (instance == null) return;
+
+        Camera camera = instance.acquireCameraInstance(options.getInt("type"));
+        if (camera == null) return;
+
         camera.startPreview();
     }