fix flashlight for Android 4

Author: tibbi

app/src/main/java/com/simplemobiletools/flashlight/MainActivity.java

@@ -59,13 +59,13 @@ public void toggleFlashlight() {
     @Override
     protected void onStart() {
         super.onStart();
-        cameraImpl.setupCamera();
+        cameraImpl.handleCameraSetup();
     }
 
     @Override
     protected void onResume() {
         super.onResume();
-        cameraImpl.setupCamera();
+        cameraImpl.handleCameraSetup();
     }
 
     @Override

app/src/main/java/com/simplemobiletools/flashlight/MarshmallowCamera.java

@@ -0,0 +1,31 @@
+package com.simplemobiletools.flashlight;
+
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.hardware.camera2.CameraAccessException;
+import android.hardware.camera2.CameraManager;
+import android.os.Build;
+import android.util.Log;
+
+public class MarshmallowCamera {
+    private static final String TAG = MyCameraImpl.class.getSimpleName();
+    private MyCamera mCallback;
+    private Context mContext;
+
+    public MarshmallowCamera(MyCamera camera, Context cxt) {
+        mCallback = camera;
+        mContext = cxt;
+    }
+
+    @TargetApi(Build.VERSION_CODES.M)
+    public void toggleMarshmallowFlashlight(boolean enable) {
+        try {
+            final CameraManager manager = (CameraManager) mContext.getSystemService(Context.CAMERA_SERVICE);
+            final String[] list = manager.getCameraIdList();
+            manager.setTorchMode(list[0], enable);
+        } catch (CameraAccessException e) {
+            Log.e(TAG, "toggle marshmallow flashlight " + e.getMessage());
+            mCallback.cameraUnavailable();
+        }
+    }
+}

app/src/main/java/com/simplemobiletools/flashlight/MyCameraImpl.java

@@ -1,11 +1,7 @@
 package com.simplemobiletools.flashlight;
 
-import android.annotation.TargetApi;
 import android.content.Context;
 import android.hardware.Camera;
-import android.hardware.camera2.CameraAccessException;
-import android.hardware.camera2.CameraManager;
-import android.os.Build;
 import android.util.Log;
 
 public class MyCameraImpl {
@@ -15,15 +11,18 @@ public class MyCameraImpl {
     private boolean isFlashlightOn;
     private MyCamera callback;
     private Context context;
+    private boolean isMarshmallow;
+    private MarshmallowCamera marshmallowCamera;
 
     public MyCameraImpl(MyCamera camera, Context cxt) {
         callback = camera;
         context = cxt;
-        setupCamera();
+        isMarshmallow = isMarshmallow();
+        handleCameraSetup();
     }
 
     public void toggleFlashlight() {
-        setupCamera();
+        handleCameraSetup();
         isFlashlightOn = !isFlashlightOn;
 
         if (isFlashlightOn) {
@@ -33,8 +32,22 @@ public void toggleFlashlight() {
         }
     }
 
-    public void setupCamera() {
-        if (isMarshmallow())
+    public void handleCameraSetup() {
+        if (isMarshmallow) {
+            setupMarshmallowCamera();
+        } else {
+            setupCamera();
+        }
+    }
+
+    private void setupMarshmallowCamera() {
+        if (marshmallowCamera == null) {
+            marshmallowCamera = new MarshmallowCamera(callback, context);
+        }
+    }
+
+    private void setupCamera() {
+        if (isMarshmallow)
             return;
 
         if (camera == null) {
@@ -54,7 +67,7 @@ public void setupCamera() {
     }
 
     private void enableFlashlight() {
-        if (isMarshmallow()) {
+        if (isMarshmallow) {
             toggleMarshmallowFlashlight(true);
         } else {
             if (camera == null || params == null)
@@ -79,16 +92,8 @@ private void disableFlashlight() {
         callback.disableFlashlight();
     }
 
-    @TargetApi(Build.VERSION_CODES.M)
     private void toggleMarshmallowFlashlight(boolean enable) {
-        try {
-            final CameraManager manager = (CameraManager) context.getSystemService(Context.CAMERA_SERVICE);
-            final String[] list = manager.getCameraIdList();
-            manager.setTorchMode(list[0], enable);
-        } catch (CameraAccessException e) {
-            Log.e(TAG, "toggle marshmallow flashlight " + e.getMessage());
-            callback.cameraUnavailable();
-        }
+        marshmallowCamera.toggleMarshmallowFlashlight(enable);
     }
 
     public void releaseCamera() {