Separated the CameraPlugin class from the concept of the comms Camera…

…PluginProtocol, which resulted in the simplest possible implementation of CameraPlugin. Also added copyright to new files.

packages/camera/android/src/main/java/dev/flutter/plugins/camera/AndroidCameraPermissions.java

@@ -1,3 +1,7 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
 package dev.flutter.plugins.camera;
 
 import android.Manifest;
@@ -52,7 +56,7 @@ public void requestPermissions(boolean enableAudio, CameraPermissions.ResultCall
           CAMERA_REQUEST_ID);
     } else {
       // Permissions already exist. Call the callback with success.
-      callback.onResult(null, null);
+      callback.onSuccess();
     }
   }
 

packages/camera/android/src/main/java/dev/flutter/plugins/camera/AndroidCameraSystem.java

@@ -0,0 +1,227 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package dev.flutter.plugins.camera;
+
+import android.content.Context;
+import android.hardware.camera2.CameraAccessException;
+import android.hardware.camera2.CameraManager;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import io.flutter.embedding.engine.plugins.FlutterPlugin;
+import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding;
+import io.flutter.plugin.common.EventChannel;
+import io.flutter.view.TextureRegistry;
+
+/* package */ class AndroidCameraSystem implements CameraSystem {
+  @NonNull
+  private final FlutterPlugin.FlutterPluginBinding pluginBinding;
+  @NonNull
+  private final ActivityPluginBinding activityBinding;
+  @NonNull
+  private final CameraPermissions cameraPermissions;
+  @NonNull
+  private final EventChannel imageStreamChannel;
+  @Nullable
+  private Camera camera;
+
+  /* package */ AndroidCameraSystem(
+      @NonNull FlutterPlugin.FlutterPluginBinding pluginBinding,
+      @NonNull ActivityPluginBinding activityBinding,
+      @NonNull CameraPermissions cameraPermissions,
+      @NonNull EventChannel imageStreamChannel
+  ) {
+    this.pluginBinding = pluginBinding;
+    this.activityBinding = activityBinding;
+    this.cameraPermissions = cameraPermissions;
+    this.imageStreamChannel = imageStreamChannel;
+  }
+
+  @Override
+  public List<Map<String, Object>> getAvailableCameras() throws CameraAccessException {
+    return CameraUtils.getAvailableCameras(activityBinding.getActivity());
+  }
+
+  @Override
+  public void initialize(
+      @NonNull CameraConfigurationRequest request,
+      @NonNull OnCameraInitializationCallback callback
+  ) {
+    if (camera != null) {
+      camera.close();
+    }
+
+    cameraPermissions.requestPermissions(
+        request.getEnableAudio(),
+        new CameraPermissions.ResultCallback() {
+          @Override
+          public void onSuccess() {
+            try {
+              instantiateCamera(request, callback);
+            } catch (Exception error) {
+              callback.onError("CameraAccess", error.getMessage());
+            }
+          }
+
+          @Override
+          public void onResult(String errorCode, String errorDescription) {
+            callback.onCameraPermissionError(errorCode, errorDescription);
+          }
+        });
+  }
+
+  private void instantiateCamera(
+      @NonNull CameraConfigurationRequest request,
+      @NonNull OnCameraInitializationCallback callback
+  ) throws CameraAccessException {
+    TextureRegistry.SurfaceTextureEntry textureEntry = pluginBinding
+        .getFlutterEngine()
+        .getRenderer()
+        .createSurfaceTexture();
+
+    camera = new Camera(
+        activityBinding.getActivity(),
+        (CameraManager) activityBinding.getActivity().getSystemService(Context.CAMERA_SERVICE),
+        textureEntry,
+        request.getCameraName(),
+        request.getResolutionPreset(),
+        request.getEnableAudio()
+    );
+
+    camera.open(new Camera.OnCameraOpenedCallback() {
+      @Override
+      public void onCameraOpened(long textureId, int previewWidth, int previewHeight) {
+        callback.onSuccess(textureId, previewWidth, previewHeight);
+      }
+
+      @Override
+      public void onCameraOpenFailed(@NonNull String message) {
+        callback.onError("CameraAccess", message);
+      }
+    });
+
+    EventChannel cameraEventChannel = new EventChannel(
+        pluginBinding.getFlutterEngine().getDartExecutor(),
+        "flutter.io/cameraPlugin/cameraEvents" + textureEntry.id()
+    );
+    cameraEventChannel.setStreamHandler(new EventChannel.StreamHandler() {
+      @Override
+      public void onListen(Object o, final EventChannel.EventSink eventSink) {
+        final Camera.CameraEventHandler cameraEventHandler = new Camera.CameraEventHandler() {
+          @Override
+          public void onError(String description) {
+            Map<String, String> event = new HashMap<>();
+            event.put("eventType", "error");
+            event.put("errorDescription", description);
+            eventSink.success(event);
+          }
+
+          @Override
+          public void onCameraClosed() {
+            Map<String, String> event = new HashMap<>();
+            event.put("eventType", "camera_closing");
+            eventSink.success(event);
+          }
+        };
+
+        camera.setCameraEventHandler(cameraEventHandler);
+      }
+
+      @Override
+      public void onCancel(Object o) {
+        camera.setCameraEventHandler(null);
+      }
+    });
+  }
+
+  @Override
+  public void takePicture(@NonNull String filePath, @NonNull Camera.OnPictureTakenCallback callback) {
+    // TODO(mattcarroll): determine desired behavior when no camera is active
+    camera.takePicture(filePath, callback);
+  }
+
+  @Override
+  public void startVideoRecording(@NonNull String filePath, @NonNull OnStartVideoRecordingCallback callback) {
+    // TODO(mattcarroll): determine desired behavior when no camera is active
+    try {
+      camera.startVideoRecording(filePath);
+    } catch (IllegalStateException e) {
+      callback.onFileAlreadyExists(filePath);
+    } catch (CameraAccessException | IOException e) {
+      callback.onVideoRecordingFailed(e.getMessage());
+    }
+  }
+
+  @Override
+  public void stopVideoRecording(@NonNull OnVideoRecordingCommandCallback callback) {
+    // TODO(mattcarroll): determine desired behavior when no camera is active
+    try {
+      camera.stopVideoRecording();
+      callback.onSuccess();
+    } catch (CameraAccessException | IllegalStateException e) {
+      callback.onVideoRecordingFailed(e.getMessage());
+    }
+  }
+
+  @Override
+  public void pauseVideoRecording(@NonNull OnApiDependentVideoRecordingCommandCallback callback) {
+    // TODO(mattcarroll): determine desired behavior when no camera is active
+    try {
+      camera.pauseVideoRecording();
+    } catch (UnsupportedOperationException e) {
+      callback.onUnsupportedOperation();
+    } catch (IllegalStateException e) {
+      callback.onVideoRecordingFailed(e.getMessage());
+    }
+  }
+
+  @Override
+  public void resumeVideoRecording(@NonNull OnApiDependentVideoRecordingCommandCallback callback) {
+    // TODO(mattcarroll): determine desired behavior when no camera is active
+    try {
+      camera.resumeVideoRecording();
+    } catch (UnsupportedOperationException e) {
+      callback.onUnsupportedOperation();
+    } catch (IllegalStateException e) {
+      callback.onVideoRecordingFailed(e.getMessage());
+    }
+  }
+
+  @Override
+  public void startImageStream(@NonNull OnCameraAccessCommandCallback callback) {
+    // TODO(mattcarroll): determine desired behavior when no camera is active
+    try {
+      CameraPreviewDisplay previewDisplay = new CameraPreviewDisplay(imageStreamChannel);
+      camera.startPreviewWithImageStream(previewDisplay);
+      callback.success();
+    } catch (CameraAccessException e) {
+      callback.onCameraAccessFailure(e.getMessage());
+    }
+  }
+
+  @Override
+  public void stopImageStream(@NonNull OnCameraAccessCommandCallback callback) {
+    // TODO(mattcarroll): determine desired behavior when no camera is active
+    try {
+      camera.startPreview();
+      callback.success();
+    } catch (CameraAccessException e) {
+      callback.onCameraAccessFailure(e.getMessage());
+    }
+  }
+
+  @Override
+  public void dispose() {
+    if (camera != null) {
+      camera.dispose();
+    }
+  }
+}

packages/camera/android/src/main/java/dev/flutter/plugins/camera/Camera.java

@@ -335,9 +335,9 @@ private void writeToFile(ByteBuffer buffer, File file) throws IOException {
   //------ End: Take picture with Camera -------
 
   //------ Start: Video recording with Camera ----
-  public void startVideoRecording(String filePath) throws IOException, CameraAccessException, IllegalStateException {
+  public void startVideoRecording(@NonNull String filePath) throws IOException, CameraAccessException, IllegalStateException {
     if (new File(filePath).exists()) {
-      throw new IllegalStateException("File " + filePath + " already exists.");
+      throw new IOException("File " + filePath + " already exists.");
     }
 
     prepareMediaRecorder(filePath);

packages/camera/android/src/main/java/dev/flutter/plugins/camera/CameraImageStream.java

@@ -1,3 +1,7 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
 package dev.flutter.plugins.camera;
 
 import android.media.Image;

packages/camera/android/src/main/java/dev/flutter/plugins/camera/CameraPermissions.java

@@ -1,3 +1,7 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
 package dev.flutter.plugins.camera;
 
 import androidx.annotation.NonNull;