@capacitor-community/camera-preview 2.0.0-beta.0 → 2.0.0-beta.2

package/CapacitorCommunityCameraPreview.podspec

@@ -1,13 +1,14 @@
 
   Pod::Spec.new do |s|
     s.name = 'CapacitorCommunityCameraPreview'
-    s.version = '0.0.1'
+    s.version = '2.0.0'
     s.summary = 'Camera preview'
     s.license = 'MIT'
     s.homepage = 'https://github.com/capacitor-community/camera-preview.git'
     s.author = 'Ariel Hernandez Musa'
     s.source = { :git => 'https://github.com/capacitor-community/camera-preview.git', :tag => s.version.to_s }
     s.source_files = 'ios/Plugin/**/*.{swift,h,m,c,cc,mm,cpp}'
-    s.ios.deployment_target  = '11.0'
+    s.ios.deployment_target  = '12.0'
     s.dependency 'Capacitor'
+    s.swift_version = '5.1'
   end

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) Ariel Hernandez Musa.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -1,10 +1,15 @@
-# Beta version with initial support for capacitor 3
-
-# Capacitor Camera Preview
+<p align="center"><br><img src="https://user-images.githubusercontent.com/236501/85893648-1c92e880-b7a8-11ea-926d-95355b8175c7.png" width="128" height="128" /></p>
+<h3 align="center">Capacitor Camera Preview</h3>
+<p align="center"><strong><code>@capacitor-community/camera-preview</code></strong></p>
+<br>
+<p align="center"><strong>CAPACITOR 3</strong></p><br>
 
-Capacitor plugin that allows camera interaction from Javascript and HTML (based on cordova-plugin-camera-preview)
+<p align="center">
+  Capacitor plugin that allows camera interaction from Javascript and HTML<br>(based on cordova-plugin-camera-preview).
+</p>
+<br>
 
-**Releases are being kept up to date when appropriate. However, this plugin is under constant development. As such it is recommended to use master to always have the latest fixes & features.**
+Version 2 of this plugin is compatible with Ionic 5 and Capacitor 3. If your project uses Capacitor 2, please make sure you install [version 1](https://github.com/capacitor-community/camera-preview/releases/tag/v1.2.1) of this plugin.
 
 **PR's are greatly appreciated. Maintainer(s) wanted.**
 
@@ -25,22 +30,6 @@ Capacitor plugin that allows camera interaction from Javascript and HTML (based
 
 # Installation
 
-<!-- Use any one of the installation methods listed below depending on which framework you use. -->
-
-<!-- To install the master version with latest fixes and features -->
-
-<!-- ```
-cordova plugin add https://github.com/cordova-plugin-camera-preview/cordova-plugin-camera-preview.git
-
-ionic cordova plugin add https://github.com/cordova-plugin-camera-preview/cordova-plugin-camera-preview.git
-
-meteor add cordova:cordova-plugin-camera-preview@https://github.com/cordova-plugin-camera-preview/cordova-plugin-camera-preview.git#[latest_commit_id]
-
-<plugin spec="https://github.com/cordova-plugin-camera-preview/cordova-plugin-camera-preview.git" source="git" />
-``` -->
-
-<!-- or if you want to use the last released version on npm -->
-
 ```
 yarn add @capacitor-community/camera-preview
 
@@ -53,44 +42,19 @@ Then run
 npx cap sync
 ```
 
-#### Android Quirks
-
-On Android remember to add the plugin to `MainActivity`
-```java
-import com.ahm.capacitor.camera.preview.CameraPreview;
-
-
-this.init(savedInstanceState, new ArrayList<Class<? extends Plugin>>() {{
-      // Additional plugins you've installed go here
-      // Ex: add(TotallyAwesomePlugin.class);
-      add(CameraPreview.class);
-}});
+## Extra Android installation steps
+Open `android/app/src/main/AndroidManifest.xml` and above the closing `</manifest>` tag add this line to request the CAMERA permission:
+```xml
+<uses-permission android:name="android.permission.CAMERA" />
 ```
+For more help consult the [Capacitor docs](https://capacitorjs.com/docs/android/configuration#configuring-androidmanifestxml).
 
-#### Web Quirks
-Add `import '@capacitor-community/camera-preview'` to you entry script in ionic on `app.module.ts`, so capacitor can register the web platform from the plugin
-<!--
-#### iOS Quirks
-If you are developing for iOS 10+ you must also add the following to your config.xml
+## Extra iOS installation steps
+You will need to add two permissions to `Info.plist`. Follow the [Capacitor docs](https://capacitorjs.com/docs/ios/configuration#configuring-infoplist) and add permissions with the raw keys `NSCameraUsageDescription` and `NSMicrophoneUsageDescription`.
 
-```xml
-<config-file platform="ios" target="*-Info.plist" parent="NSCameraUsageDescription" overwrite="true">
-  <string>Allow the app to use your camera</string>
-</config-file> -->
-
-<!-- or for Phonegap -->
+## Extra Web installation steps
+Add `import '@capacitor-community/camera-preview'` to you entry script in ionic on `app.module.ts`, so capacitor can register the web platform from the plugin
 
-<!-- <gap:config-file platform="ios" target="*-Info.plist" parent="NSCameraUsageDescription" overwrite="true">
-  <string>Allow the app to use your camera</string>
-</gap:config-file>
-``` -->
-<!--
-#### Android Quirks (older devices)
-When using the plugin for older devices, the camera preview will take the focus inside the app once initialized.
-In order to prevent the app from closing when a user presses the back button, the event for the camera view is disabled.
-If you still want the user to navigate, you can add a listener for the back event for the preview
-(see <code>[onBackButton](#onBackButton)</code>)
- -->
 
 # Methods
 
@@ -112,6 +76,7 @@ Starts the camera preview instance.
 | storeToFile | boolean       | (optional) Capture images to a file and return back the file path instead of returning base64 encoded data, default false. |
 | disableExifHeaderStripping | boolean       | (optional) Disable automatic rotation of the image, and let the browser deal with it, default true (applicable to the android and ios platforms only) |
 | disableAudio | boolean | (optional) Disables audio stream to prevent permission requests, default false. (applicable to web only) |
+| lockAndroidOrientation | boolean | (optional) Locks device orientation when camer is showing, default false. (applicable to Android only) |
 
 <!-- <strong>Options:</strong>
 All options stated are optional and will default to values here
@@ -148,7 +113,7 @@ ion-content {
   --background: transparent;
 }
 ```
-Take into account that this will make transparent all ion-content on application, if you want to show camera preview only in one page, just add a cutom class to your ion-content and make it transparent:
+Take into account that this will make transparent all ion-content on application, if you want to show camera preview only in one page, just add a custom class to your ion-content and make it transparent:
 
 ```css
 .my-custom-camera-preview-content {
@@ -205,7 +170,7 @@ CameraPreview.hide();
 <!-- <info>Take the picture. If width and height are not specified or are 0 it will use the defaults. If width and height are specified, it will choose a supported photo size that is closest to width and height specified and has closest aspect ratio to the preview. The argument `quality` defaults to `85` and specifies the quality/compression value: `0=max compression`, `100=max quality`.</info><br/> -->
 
 ```javascript
-import { CameraPreviewFlashMode } from 'c@capacitor-community/camera-preview';
+import { CameraPreviewFlashMode } from '@capacitor-community/camera-preview';
 
 const cameraPreviewPictureOptions: CameraPreviewPictureOptions = {
   quality: 50
@@ -218,6 +183,28 @@ const base64PictureData = result.value;
 
 ```
 
+### captureSample(options)
+
+| Option   | values        | descriptions                                                         |
+|----------|---------------|----------------------------------------------------------------------|
+| quality  | number        | (optional) The picture quality, 0 - 100, default 85                  |
+
+<info>Captures a sample image from the video stream. Only for Android and iOS, web implementation falls back to `capture` method. This can be used to perform real-time analysis on the current frame in the video. The argument `quality` defaults to `85` and specifies the quality/compression value: `0=max compression`, `100=max quality`.</info><br/>
+
+```javascript
+import { CameraSampleOptions } from '@capacitor-community/camera-preview';
+
+const cameraSampleOptions: CameraSampleOptions = {
+  quality: 50
+};
+
+const result = await CameraPreview.captureSample(cameraSampleOptions);
+const base64PictureData = result.value;
+
+// do something with base64PictureData
+
+```
+
 ### getSupportedFlashModes()
 
 <info>Get the flash modes supported by the camera device currently started. Returns an array containing supported flash modes. See <code>[FLASH_MODE](#camera_Settings.FlashMode)</code> for possible values that can be returned</info><br/>
@@ -408,3 +395,5 @@ Created by Marcel Barbosa Pinto [@mbppower](https://github.com/mbppower)
 # Demo
 
 A working example can be found at [Demo](https://github.com/capacitor-community/camera-preview/tree/master/demo)
+
+To run the demo on your local network and access media devices, a secure context is needed. Add an `.env` file at the root of the demo folder with `HTTPS=true` to start react with HTTPS.

package/android/build.gradle

@@ -11,10 +11,10 @@ buildscript {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 30
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 28
+        targetSdkVersion 30
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -40,8 +40,8 @@ repositories {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation project(':capacitor-android')
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.exifinterface:exifinterface:1.0.0'
+    implementation 'androidx.appcompat:appcompat:1.3.0'
+    implementation 'androidx.exifinterface:exifinterface:1.3.2'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'

package/android/src/main/java/com/ahm/capacitor/camera/preview/CameraPreview.java

@@ -1,8 +1,8 @@
 package com.ahm.capacitor.camera.preview;
 
-import android.Manifest;
 import android.app.FragmentManager;
 import android.app.FragmentTransaction;
+import android.content.pm.ActivityInfo;
 import android.graphics.Color;
 import android.graphics.Point;
 import android.hardware.Camera;
@@ -13,33 +13,40 @@ import android.view.ViewGroup;
 import android.widget.FrameLayout;
 
 import com.getcapacitor.JSObject;
-import com.getcapacitor.NativePlugin;
+import com.getcapacitor.Logger;
+import com.getcapacitor.PermissionState;
 import com.getcapacitor.Plugin;
 import com.getcapacitor.PluginCall;
 import com.getcapacitor.PluginMethod;
+import com.getcapacitor.annotation.CapacitorPlugin;
+import com.getcapacitor.annotation.Permission;
+import com.getcapacitor.annotation.PermissionCallback;
 
 import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
 
-import java.util.List;
 import java.io.File;
+import java.util.List;
 
-@NativePlugin(
+import static android.Manifest.permission.CAMERA;
+
+@CapacitorPlugin(
+        name = "CameraPreview",
         permissions = {
-                Manifest.permission.CAMERA,
-                Manifest.permission.RECORD_AUDIO,
-                Manifest.permission.WRITE_EXTERNAL_STORAGE,
-                Manifest.permission.READ_EXTERNAL_STORAGE
-        },
-        requestCodes = {
-                CameraPreview.REQUEST_CAMERA_PERMISSION
+                @Permission(strings = {CAMERA}, alias = CameraPreview.CAMERA_PERMISSION_ALIAS)
         }
 )
 public class CameraPreview extends Plugin implements CameraActivity.CameraPreviewListener {
+    static final String CAMERA_PERMISSION_ALIAS = "camera";
+
     private static String VIDEO_FILE_PATH = "";
     private static String VIDEO_FILE_EXTENSION = ".mp4";
-    static final int REQUEST_CAMERA_PERMISSION = 1234;
+
+    private String captureCallbackId = "";
+    private String snapshotCallbackId = "";
+    private String recordCallbackId = "";
+
+    // keep track of previously specified orientation to support locking orientation:
+    private int previousOrientationRequest = -1;
 
     private CameraActivity fragment;
     private int containerViewId = 20;
@@ -50,26 +57,19 @@ public class CameraPreview extends Plugin implements CameraActivity.CameraPrevie
 
         JSObject ret = new JSObject();
         ret.put("value", value);
-        call.success(ret);
+        call.resolve(ret);
     }
 
     @PluginMethod()
     public void start(PluginCall call) {
-        saveCall(call);
-
-        if (hasRequiredPermissions()) {
+        if (PermissionState.GRANTED.equals(getPermissionState(CAMERA_PERMISSION_ALIAS))) {
             startCamera(call);
         } else {
-            pluginRequestPermissions(new String[]{
-                    Manifest.permission.CAMERA,
-                    Manifest.permission.RECORD_AUDIO,
-                    Manifest.permission.WRITE_EXTERNAL_STORAGE,
-                    Manifest.permission.READ_EXTERNAL_STORAGE
-            }, REQUEST_CAMERA_PERMISSION);
+            requestPermissionForAlias(CAMERA_PERMISSION_ALIAS, call, "handleCameraPermissionResult");
         }
     }
 
-    @PluginMethod
+    @PluginMethod()
     public void flip(PluginCall call) {
         try {
             fragment.switchCamera();
@@ -82,11 +82,11 @@ public class CameraPreview extends Plugin implements CameraActivity.CameraPrevie
     @PluginMethod()
     public void capture(PluginCall call) {
         if(this.hasCamera(call) == false){
-            call.error("Camera is not running");
+            call.reject("Camera is not running");
             return;
         }
-
-        saveCall(call);
+        bridge.saveCall(call);
+        captureCallbackId = call.getCallbackId();
 
         Integer quality = call.getInt("quality", 85);
         // Image Dimensions - Optional
@@ -95,6 +95,19 @@ public class CameraPreview extends Plugin implements CameraActivity.CameraPrevie
         fragment.takePicture(width, height, quality);
     }
 
+    @PluginMethod()
+    public void captureSample(PluginCall call) {
+        if(this.hasCamera(call) == false){
+            call.reject("Camera is not running");
+            return;
+        }
+        bridge.saveCall(call);
+        snapshotCallbackId = call.getCallbackId();
+
+        Integer quality = call.getInt("quality", 85);
+        fragment.takeSnapshot(quality);
+    }
+
     @PluginMethod()
     public void stop(final PluginCall call) {
         bridge.getActivity().runOnUiThread(new Runnable() {
@@ -102,6 +115,9 @@ public class CameraPreview extends Plugin implements CameraActivity.CameraPrevie
             public void run() {
                 FrameLayout containerView = getBridge().getActivity().findViewById(containerViewId);
 
+                // allow orientation changes after closing camera:
+                getBridge().getActivity().setRequestedOrientation(previousOrientationRequest);
+
                 if (containerView != null) {
                     ((ViewGroup)getBridge().getWebView().getParent()).removeView(containerView);
                     getBridge().getWebView().setBackgroundColor(Color.WHITE);
@@ -111,7 +127,7 @@ public class CameraPreview extends Plugin implements CameraActivity.CameraPrevie
                     fragmentTransaction.commit();
                     fragment = null;
 
-                    call.success();
+                    call.resolve();
                 } else {
                     call.reject("camera already stopped");
                 }
@@ -122,7 +138,7 @@ public class CameraPreview extends Plugin implements CameraActivity.CameraPrevie
     @PluginMethod()
     public void getSupportedFlashModes(PluginCall call) {
         if(this.hasCamera(call) == false){
-            call.error("Camera is not running");
+            call.reject("Camera is not running");
             return;
         }
 
@@ -140,20 +156,20 @@ public class CameraPreview extends Plugin implements CameraActivity.CameraPrevie
 
         JSObject jsObject = new JSObject();
         jsObject.put("result", jsonFlashModes);
-        call.success(jsObject);
+        call.resolve(jsObject);
 
     }
 
     @PluginMethod()
     public void setFlashMode(PluginCall call) {
         if(this.hasCamera(call) == false){
-            call.error("Camera is not running");
+            call.reject("Camera is not running");
             return;
         }
 
         String flashMode = call.getString("flashMode");
         if(flashMode == null || flashMode.isEmpty() == true) {
-            call.error("flashMode required parameter is missing");
+            call.reject("flashMode required parameter is missing");
             return;
         }
 
@@ -165,36 +181,75 @@ public class CameraPreview extends Plugin implements CameraActivity.CameraPrevie
         if (supportedFlashModes.indexOf(flashMode) > -1) {
             params.setFlashMode(flashMode);
         } else {
-            call.error("Flash mode not recognised: " + flashMode);
+            call.reject("Flash mode not recognised: " + flashMode);
             return;
         }
 
         fragment.setCameraParameters(params);
 
-        call.success();
+        call.resolve();
     }
 
-    @Override
-    protected void handleRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
-        super.handleRequestPermissionsResult(requestCode, permissions, grantResults);
-        if (requestCode == REQUEST_CAMERA_PERMISSION) {
-            boolean permissionsGranted = true;
-            for (int grantResult: grantResults) {
-                if (grantResult != 0) {
-                    permissionsGranted = false;
-                }
-            }
+    @PluginMethod()
+    public void startRecordVideo(final PluginCall call) {
+        if(this.hasCamera(call) == false){
+            call.reject("Camera is not running");
+            return;
+        }
+        final String filename = "videoTmp";
+        VIDEO_FILE_PATH = getActivity().getCacheDir().toString() + "/";
 
-            PluginCall savedCall = getSavedCall();
-            if (permissionsGranted) {
-                startCamera(savedCall);
-            } else {
-                savedCall.reject("permission failed");
+        final String position = call.getString("position", "front");
+        final Integer width = call.getInt("width", 0);
+        final Integer height = call.getInt("height", 0);
+        final Boolean withFlash = call.getBoolean("withFlash", false);
+        final Integer maxDuration = call.getInt("maxDuration", 0);
+        // final Integer quality = call.getInt("quality", 0);
+        bridge.saveCall(call);
+        recordCallbackId = call.getCallbackId();
+
+        bridge.getActivity().runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                // fragment.startRecord(getFilePath(filename), position, width, height, quality, withFlash);
+                fragment.startRecord(getFilePath(filename), position, width, height, 70, withFlash, maxDuration);
             }
+        });
+
+        call.resolve();
+    }
+
+    @PluginMethod()
+    public void stopRecordVideo(PluginCall call) {
+        if(this.hasCamera(call) == false){
+            call.reject("Camera is not running");
+            return;
         }
 
+        System.out.println("stopRecordVideo - Callbackid=" + call.getCallbackId());
+
+        bridge.saveCall(call);
+        recordCallbackId = call.getCallbackId();
+
+        // bridge.getActivity().runOnUiThread(new Runnable() {
+        //     @Override
+        //     public void run() {
+        //         fragment.stopRecord();
+        //     }
+        // });
 
+        fragment.stopRecord();
+        // call.resolve();
+    }
 
+    @PermissionCallback
+    private void handleCameraPermissionResult(PluginCall call) {
+        if (PermissionState.GRANTED.equals(getPermissionState(CAMERA_PERMISSION_ALIAS))) {
+            startCamera(call);
+        } else {
+            Logger.debug(getLogTag(), "User denied camera permission: " + getPermissionState(CAMERA_PERMISSION_ALIAS).toString());
+            call.reject("Permission failed: user denied access to camera.");
+        }
     }
 
     private void startCamera(final PluginCall call) {
@@ -215,6 +270,8 @@ public class CameraPreview extends Plugin implements CameraActivity.CameraPrevie
         final Boolean toBack = call.getBoolean("toBack", false);
         final Boolean storeToFile = call.getBoolean("storeToFile", false);
         final Boolean disableExifHeaderStripping = call.getBoolean("disableExifHeaderStripping", true);
+        final Boolean lockOrientation = call.getBoolean("lockAndroidOrientation", false);
+        previousOrientationRequest = getBridge().getActivity().getRequestedOrientation();
 
         fragment = new CameraActivity();
         fragment.setEventListener(this);
@@ -230,6 +287,11 @@ public class CameraPreview extends Plugin implements CameraActivity.CameraPrevie
             @Override
             public void run() {
                 DisplayMetrics metrics = getBridge().getActivity().getResources().getDisplayMetrics();
+                // lock orientation if specified in options:
+                if (lockOrientation) {
+                    getBridge().getActivity().setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LOCKED);
+                }
+
                 // offset
                 int computedX = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, x, metrics);
                 int computedY = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, y, metrics);
@@ -283,7 +345,7 @@ public class CameraPreview extends Plugin implements CameraActivity.CameraPrevie
                     fragmentTransaction.add(containerView.getId(), fragment);
                     fragmentTransaction.commit();
 
-                    call.success();
+                    call.resolve();
                 } else {
                     call.reject("camera already started");
                 }
@@ -291,7 +353,6 @@ public class CameraPreview extends Plugin implements CameraActivity.CameraPrevie
         });
     }
 
-
     @Override
     protected void handleOnResume() {
         super.handleOnResume();
@@ -301,29 +362,24 @@ public class CameraPreview extends Plugin implements CameraActivity.CameraPrevie
     public void onPictureTaken(String originalPicture) {
         JSObject jsObject = new JSObject();
         jsObject.put("value", originalPicture);
-        getSavedCall().success(jsObject);
+        bridge.getSavedCall(captureCallbackId).resolve(jsObject);
     }
 
     @Override
     public void onPictureTakenError(String message) {
-        getSavedCall().reject(message);
+        bridge.getSavedCall(captureCallbackId).reject(message);
     }
 
     @Override
     public void onSnapshotTaken(String originalPicture) {
-        JSONArray data = new JSONArray();
-        data.put(originalPicture);
-
-        PluginCall call = getSavedCall();
-
         JSObject jsObject = new JSObject();
-        jsObject.put("result", data);
-        call.success(jsObject);
+        jsObject.put("value", originalPicture);
+        bridge.getSavedCall(snapshotCallbackId).resolve(jsObject);
     }
 
     @Override
     public void onSnapshotTakenError(String message) {
-        getSavedCall().reject(message);
+        bridge.getSavedCall(snapshotCallbackId).reject(message);
     }
 
     @Override
@@ -343,9 +399,7 @@ public class CameraPreview extends Plugin implements CameraActivity.CameraPrevie
 
     @Override
     public void onCameraStarted() {
-        PluginCall pluginCall = getSavedCall();
         System.out.println("camera started");
-        pluginCall.success();
     }
 
     @Override
@@ -354,20 +408,22 @@ public class CameraPreview extends Plugin implements CameraActivity.CameraPrevie
     }
     @Override
     public void onStartRecordVideoError(String message) {
-        getSavedCall().reject(message);
+        bridge.getSavedCall(recordCallbackId).reject(message);
     }
     @Override
     public void onStopRecordVideo(String file) {
-        PluginCall pluginCall = getSavedCall();
+        PluginCall pluginCall = bridge.getSavedCall(recordCallbackId);
         JSObject jsObject = new JSObject();
         jsObject.put("videoFilePath", file);
-        pluginCall.success(jsObject);
+        pluginCall.resolve(jsObject);
     }
     @Override
     public void onStopRecordVideoError(String error) {
-        getSavedCall().reject(error);
+        bridge.getSavedCall(recordCallbackId).reject(error);
     }
 
+
+
     private boolean hasView(PluginCall call) {
         if(fragment == null) {
             return false;
@@ -388,62 +444,15 @@ public class CameraPreview extends Plugin implements CameraActivity.CameraPrevie
         return true;
     }
 
-    @PluginMethod()
-    public void startRecordVideo(final PluginCall call) {
-        if(this.hasCamera(call) == false){
-            call.error("Camera is not running");
-            return;
-        }
-        final String filename = "videoTmp";
-        VIDEO_FILE_PATH = getActivity().getCacheDir().toString() + "/";
-
-        final String position = call.getString("position", "front");
-        final Integer width = call.getInt("width", 0);
-        final Integer height = call.getInt("height", 0);
-        final Boolean withFlash = call.getBoolean("withFlash", false);
-        final Integer maxDuration = call.getInt("maxDuration", 0);
-        // final Integer quality = call.getInt("quality", 0);
-
-        bridge.getActivity().runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                // fragment.startRecord(getFilePath(filename), position, width, height, quality, withFlash);
-                fragment.startRecord(getFilePath(filename), position, width, height, 70, withFlash, maxDuration);
-            }
-        });
-
-        call.success();
-    }
-
-    @PluginMethod()
-    public void stopRecordVideo(PluginCall call) {
-       if(this.hasCamera(call) == false){
-            call.error("Camera is not running");
-            return;
-        }
-
-        saveCall(call);
-
-        // bridge.getActivity().runOnUiThread(new Runnable() {
-        //     @Override
-        //     public void run() {
-        //         fragment.stopRecord();
-        //     }
-        // });
-
-        fragment.stopRecord();
-        // call.success();
-    }
-
     private String getFilePath(String filename) {
         String fileName = filename;
 
         int i = 1;
 
         while (new File(VIDEO_FILE_PATH + fileName + VIDEO_FILE_EXTENSION).exists()) {
-        // Add number suffix if file exists
-        fileName = filename + '_' + i;
-        i++;
+            // Add number suffix if file exists
+            fileName = filename + '_' + i;
+            i++;
         }
 
         return VIDEO_FILE_PATH + fileName + VIDEO_FILE_EXTENSION;