expo-camera 12.0.2 → 12.1.2

package/android/src/main/java/expo/modules/camera/tasks/BarCodeScannerAsyncTask.java

@@ -1,47 +0,0 @@
-package expo.modules.camera.tasks;
-
-import expo.modules.interfaces.barcodescanner.BarCodeScannerInterface;
-import expo.modules.interfaces.barcodescanner.BarCodeScannerResult;
-
-public class BarCodeScannerAsyncTask extends android.os.AsyncTask<Void, Void, BarCodeScannerResult> {
-  private final BarCodeScannerInterface mBarCodeScanner;
-  private byte[] mImageData;
-  private int mWidth;
-  private int mHeight;
-  private int mRotation;
-  private BarCodeScannerAsyncTaskDelegate mDelegate;
-
-  public BarCodeScannerAsyncTask(
-      BarCodeScannerAsyncTaskDelegate delegate,
-      BarCodeScannerInterface barCodeScanner,
-      byte[] imageData,
-      int width,
-      int height,
-      int rotation
-  ) {
-    mImageData = imageData;
-    mWidth = width;
-    mHeight = height;
-    mDelegate = delegate;
-    mBarCodeScanner = barCodeScanner;
-    mRotation = rotation;
-  }
-
-  @Override
-  protected BarCodeScannerResult doInBackground(Void... ignored) {
-    if (isCancelled() || mDelegate == null) {
-      return null;
-    }
-
-    return mBarCodeScanner.scan(mImageData, mWidth, mHeight, mRotation);
-  }
-
-  @Override
-  protected void onPostExecute(BarCodeScannerResult result) {
-    super.onPostExecute(result);
-    if (result != null) {
-      mDelegate.onBarCodeScanned(result);
-    }
-    mDelegate.onBarCodeScanningTaskCompleted();
-  }
-}

package/android/src/main/java/expo/modules/camera/tasks/BarCodeScannerAsyncTaskDelegate.java

@@ -1,8 +0,0 @@
-package expo.modules.camera.tasks;
-
-import expo.modules.interfaces.barcodescanner.BarCodeScannerResult;
-
-public interface BarCodeScannerAsyncTaskDelegate {
-  void onBarCodeScanned(BarCodeScannerResult barCode);
-  void onBarCodeScanningTaskCompleted();
-}

package/android/src/main/java/expo/modules/camera/tasks/FaceDetectorAsyncTaskDelegate.java

@@ -1,13 +0,0 @@
-package expo.modules.camera.tasks;
-
-import android.os.Bundle;
-
-import java.util.List;
-
-import expo.modules.interfaces.facedetector.FaceDetectorInterface;
-
-public interface FaceDetectorAsyncTaskDelegate {
-  void onFacesDetected(List<Bundle> faces);
-  void onFaceDetectionError(FaceDetectorInterface faceDetector);
-  void onFaceDetectingTaskCompleted();
-}

package/android/src/main/java/expo/modules/camera/tasks/FaceDetectorTask.java

@@ -1,53 +0,0 @@
-package expo.modules.camera.tasks;
-
-import expo.modules.interfaces.facedetector.FaceDetectorInterface;
-
-public class FaceDetectorTask {
-
-  private byte[] mImageData;
-  private int mWidth;
-  private int mHeight;
-  private int mRotation;
-  private boolean mMirrored;
-  private double mScaleX;
-  private double mScaleY;
-  private FaceDetectorInterface mFaceDetector;
-  private FaceDetectorAsyncTaskDelegate mDelegate;
-
-  public FaceDetectorTask(
-      FaceDetectorAsyncTaskDelegate delegate,
-      FaceDetectorInterface faceDetector,
-      byte[] imageData,
-      int width,
-      int height,
-      int rotation,
-      boolean mirrored,
-      double scaleX,
-      double scaleY
-  ) {
-    mImageData = imageData;
-    mWidth = width;
-    mHeight = height;
-    mMirrored = mirrored;
-    mScaleX = scaleX;
-    mScaleY = scaleY;
-    mRotation = rotation;
-    mDelegate = delegate;
-    mFaceDetector = faceDetector;
-  }
-
-  public void execute() {
-    mFaceDetector.detectFaces(mImageData, mWidth, mHeight, mRotation, mMirrored, mScaleX, mScaleY, result -> {
-      if (result != null) {
-        mDelegate.onFacesDetected(result);
-      } else {
-        mDelegate.onFaceDetectionError(mFaceDetector);
-      }
-      mDelegate.onFaceDetectingTaskCompleted();
-    }, error -> {
-      mDelegate.onFaceDetectionError(mFaceDetector);
-      mDelegate.onFaceDetectingTaskCompleted();
-    }, skippedReason -> mDelegate.onFaceDetectingTaskCompleted());
-  }
-
-}

package/android/src/main/java/expo/modules/camera/tasks/PictureSavedDelegate.java

@@ -1,7 +0,0 @@
-package expo.modules.camera.tasks;
-
-import android.os.Bundle;
-
-public interface PictureSavedDelegate {
-  void onPictureSaved(Bundle response);
-}

package/android/src/main/java/expo/modules/camera/tasks/ResolveTakenPictureAsyncTask.java

@@ -1,288 +0,0 @@
-package expo.modules.camera.tasks;
-
-import android.content.res.Resources;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.Matrix;
-import android.os.Bundle;
-
-import androidx.exifinterface.media.ExifInterface;
-
-import android.net.Uri;
-import android.os.AsyncTask;
-import android.util.Base64;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.Map;
-
-import expo.modules.core.Promise;
-
-import expo.modules.camera.CameraViewHelper;
-import expo.modules.camera.utils.FileSystemUtils;
-
-public class ResolveTakenPictureAsyncTask extends AsyncTask<Void, Void, Bundle> {
-  private static final String DIRECTORY_NOT_FOUND_MSG = "Documents directory of the app could not be found.";
-  private static final String UNKNOWN_IO_EXCEPTION_MSG = "An unknown I/O exception has occurred.";
-  private static final String UNKNOWN_EXCEPTION_MSG = "An unknown exception has occurred.";
-
-  private static final String ERROR_TAG = "E_TAKING_PICTURE_FAILED";
-
-  private static final String DIRECTORY_NAME = "Camera";
-  private static final String EXTENSION = ".jpg";
-
-  private static final String SKIP_PROCESSING_KEY = "skipProcessing";
-  private static final String FAST_MODE_KEY = "fastMode";
-  private static final String QUALITY_KEY = "quality";
-  private static final String BASE64_KEY = "base64";
-  private static final String HEIGHT_KEY = "height";
-  private static final String WIDTH_KEY = "width";
-  private static final String EXIF_KEY = "exif";
-  private static final String DATA_KEY = "data";
-  private static final String URI_KEY = "uri";
-  private static final String ID_KEY = "id";
-
-  private static final int DEFAULT_QUALITY = 1;
-
-  private Promise mPromise;
-  private byte[] mImageData;
-  private Bitmap mBitmap;
-  private Map<String, Object> mOptions;
-  private File mDirectory;
-  private PictureSavedDelegate mPictureSavedDelegate;
-
-  public ResolveTakenPictureAsyncTask(byte[] imageData, Promise promise, Map<String, Object> options, File directory, PictureSavedDelegate delegate) {
-    mPromise = promise;
-    mOptions = options;
-    mImageData = imageData;
-    mDirectory = directory;
-    mPictureSavedDelegate = delegate;
-  }
-
-  public ResolveTakenPictureAsyncTask(Bitmap bitmap, Promise promise, Map<String, Object> options, File directory, PictureSavedDelegate delegate) {
-    mPromise = promise;
-    mBitmap = bitmap;
-    mOptions = options;
-    mDirectory = directory;
-    mPictureSavedDelegate = delegate;
-  }
-
-  private int getQuality() {
-    if (mOptions.get(QUALITY_KEY) instanceof Number) {
-      double requestedQuality = ((Number) mOptions.get(QUALITY_KEY)).doubleValue();
-      return (int) (requestedQuality * 100);
-    }
-
-    return DEFAULT_QUALITY * 100;
-  }
-
-  @Override
-  protected Bundle doInBackground(Void... voids) {
-    // handle SkipProcessing
-    if (mImageData != null && isOptionEnabled(SKIP_PROCESSING_KEY)) {
-      return handleSkipProcessing();
-    }
-
-    Bundle response = new Bundle();
-
-    if (mBitmap == null) {
-      mBitmap = BitmapFactory.decodeByteArray(mImageData, 0, mImageData.length);
-    }
-
-    ByteArrayInputStream inputStream = new ByteArrayInputStream(mImageData);
-
-    try {
-      ExifInterface exifInterface = new ExifInterface(inputStream);
-      // Get orientation of the image from mImageData via inputStream
-      int orientation = exifInterface.getAttributeInt(
-          ExifInterface.TAG_ORIENTATION,
-          ExifInterface.ORIENTATION_UNDEFINED
-      );
-
-      // Rotate the bitmap to the proper orientation if needed
-      if (orientation != ExifInterface.ORIENTATION_UNDEFINED) {
-        mBitmap = rotateBitmap(mBitmap, getImageRotation(orientation));
-      }
-
-      // Write Exif data to the response if requested
-      if (isOptionEnabled(EXIF_KEY)) {
-        Bundle exifData = CameraViewHelper.getExifData(exifInterface);
-        response.putBundle(EXIF_KEY, exifData);
-      }
-
-      // Upon rotating, write the image's dimensions to the response
-      response.putInt(WIDTH_KEY, mBitmap.getWidth());
-      response.putInt(HEIGHT_KEY, mBitmap.getHeight());
-
-      // Cache compressed image in imageStream
-      ByteArrayOutputStream imageStream = new ByteArrayOutputStream();
-      mBitmap.compress(Bitmap.CompressFormat.JPEG, getQuality(), imageStream);
-      // Write compressed image to file in cache directory
-      String filePath = writeStreamToFile(imageStream);
-
-      // Save Exif data to the image if requested
-      if (isOptionEnabled(EXIF_KEY)) {
-        ExifInterface exifFromFile = new ExifInterface(filePath);
-        CameraViewHelper.addExifData(exifFromFile, exifInterface);
-      }
-
-      File imageFile = new File(filePath);
-      String fileUri = Uri.fromFile(imageFile).toString();
-      response.putString(URI_KEY, fileUri);
-
-      // Write base64-encoded image to the response if requested
-      if (isOptionEnabled(BASE64_KEY)) {
-        response.putString(BASE64_KEY, Base64.encodeToString(imageStream.toByteArray(), Base64.NO_WRAP));
-      }
-
-      // Cleanup
-      imageStream.close();
-      inputStream.close();
-      inputStream = null;
-
-      return response;
-    } catch (Resources.NotFoundException e) {
-      mPromise.reject(ERROR_TAG, DIRECTORY_NOT_FOUND_MSG, e);
-      e.printStackTrace();
-    } catch (IOException e) {
-      mPromise.reject(ERROR_TAG, UNKNOWN_IO_EXCEPTION_MSG, e);
-      e.printStackTrace();
-    } catch (Exception e) {
-      mPromise.reject(ERROR_TAG, UNKNOWN_EXCEPTION_MSG, e);
-      e.printStackTrace();
-    } finally {
-      try {
-        if (inputStream != null) {
-          inputStream.close();
-        }
-      } catch (IOException e) {
-        e.printStackTrace();
-      }
-    }
-
-    // An exception had to occur, promise has already been rejected. Do not try to resolve it again.
-    return null;
-  }
-
-  private Bundle handleSkipProcessing() {
-    Bundle response = new Bundle();
-    try {
-      // save byte array (it's already a JPEG)
-      ByteArrayOutputStream imageStream = new ByteArrayOutputStream();
-      imageStream.write(mImageData);
-
-      // write compressed image to file in cache directory
-      String filePath = writeStreamToFile(imageStream);
-      File imageFile = new File(filePath);
-
-      // handle image uri
-      String fileUri = Uri.fromFile(imageFile).toString();
-      response.putString(URI_KEY, fileUri);
-
-      // read exif information
-      ExifInterface exifInterface = new ExifInterface(filePath);
-
-      // handle image dimensions
-      response.putInt(WIDTH_KEY, exifInterface.getAttributeInt(ExifInterface.TAG_IMAGE_WIDTH, -1));
-      response.putInt(HEIGHT_KEY, exifInterface.getAttributeInt(ExifInterface.TAG_IMAGE_LENGTH, -1));
-
-      // handle exif request
-      if (isOptionEnabled(EXIF_KEY)) {
-        Bundle exifData = CameraViewHelper.getExifData(exifInterface);
-        response.putBundle(EXIF_KEY, exifData);
-      }
-
-      // handle base64
-      if (isOptionEnabled(BASE64_KEY)) {
-        response.putString(BASE64_KEY, Base64.encodeToString(mImageData, Base64.NO_WRAP));
-      }
-
-      return response;
-    } catch (IOException e) {
-      mPromise.reject(ERROR_TAG, UNKNOWN_IO_EXCEPTION_MSG, e);
-      e.printStackTrace();
-    } catch (Exception e) {
-      mPromise.reject(ERROR_TAG, UNKNOWN_EXCEPTION_MSG, e);
-      e.printStackTrace();
-    }
-    // error occurred
-    return null;
-  }
-
-  @Override
-  protected void onPostExecute(Bundle response) {
-    super.onPostExecute(response);
-
-    // If the response is not null everything went well and we can resolve the promise.
-    if (response != null) {
-      if (isOptionEnabled(FAST_MODE_KEY)) {
-        Bundle wrapper = new Bundle();
-        wrapper.putInt(ID_KEY, ((Double) mOptions.get(ID_KEY)).intValue());
-        wrapper.putBundle(DATA_KEY, response);
-        mPictureSavedDelegate.onPictureSaved(wrapper);
-      } else {
-        mPromise.resolve(response);
-      }
-    }
-  }
-
-  // Write stream to file in cache directory
-  private String writeStreamToFile(ByteArrayOutputStream inputStream) throws Exception {
-    String outputPath = null;
-    Exception exception = null;
-    FileOutputStream outputStream = null;
-
-    try {
-      outputPath = FileSystemUtils.generateOutputPath(mDirectory, DIRECTORY_NAME, EXTENSION);
-      outputStream = new FileOutputStream(outputPath);
-      inputStream.writeTo(outputStream);
-    } catch (IOException e) {
-      e.printStackTrace();
-      exception = e;
-    } finally {
-      try {
-        if (outputStream != null) {
-          outputStream.close();
-        }
-      } catch (IOException e) {
-        e.printStackTrace();
-      }
-    }
-
-    if (exception != null) {
-      throw exception;
-    }
-
-    return outputPath;
-  }
-
-  private Bitmap rotateBitmap(Bitmap source, int angle) {
-    Matrix matrix = new Matrix();
-    matrix.postRotate(angle);
-    return Bitmap.createBitmap(source, 0, 0, source.getWidth(), source.getHeight(), matrix, true);
-  }
-
-  // Get rotation degrees from Exif orientation enum
-  private int getImageRotation(int orientation) {
-    int rotationDegrees = 0;
-    switch (orientation) {
-      case ExifInterface.ORIENTATION_ROTATE_90:
-        rotationDegrees = 90;
-        break;
-      case ExifInterface.ORIENTATION_ROTATE_180:
-        rotationDegrees = 180;
-        break;
-      case ExifInterface.ORIENTATION_ROTATE_270:
-        rotationDegrees = 270;
-        break;
-    }
-    return rotationDegrees;
-  }
-
-  private boolean isOptionEnabled(String key) {
-    return mOptions.get(key) != null && (Boolean) mOptions.get(key);
-  }
-}

package/android/src/main/java/expo/modules/camera/utils/FileSystemUtils.java

@@ -1,21 +0,0 @@
-package expo.modules.camera.utils;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.UUID;
-
-public class FileSystemUtils {
-  public static File ensureDirExists(File dir) throws IOException {
-    if (!(dir.isDirectory() || dir.mkdirs())) {
-      throw new IOException("Couldn't create directory '" + dir + "'");
-    }
-    return dir;
-  }
-
-  public static String generateOutputPath(File internalDirectory, String dirName, String extension) throws IOException {
-    File directory = new File(internalDirectory + File.separator + dirName);
-    FileSystemUtils.ensureDirExists(directory);
-    String filename = UUID.randomUUID().toString();
-    return directory + File.separator + filename + extension;
-  }
-}

package/android/src/main/java/expo/modules/camera/utils/ImageDimensions.java

@@ -1,64 +0,0 @@
-package expo.modules.camera.utils;
-
-public class ImageDimensions {
-  private int mWidth;
-  private int mHeight;
-  private int mFacing;
-  private int mRotation;
-
-  public ImageDimensions(int width, int height) {
-    this(width, height, 0);
-  }
-
-  public ImageDimensions(int width, int height, int rotation) {
-    this(width, height, rotation, -1);
-  }
-
-  public ImageDimensions(int width, int height, int rotation, int facing) {
-    mWidth = width;
-    mHeight = height;
-    mFacing = facing;
-    mRotation = rotation;
-  }
-
-  public boolean isLandscape() {
-    return mRotation % 180 == 90;
-  }
-
-  public int getWidth() {
-    if (isLandscape()) {
-      return mHeight;
-    }
-
-    return mWidth;
-  }
-
-  public int getHeight() {
-    if (isLandscape()) {
-      return mWidth;
-    }
-
-    return mHeight;
-  }
-
-  public int getRotation() {
-    return mRotation;
-  }
-
-  public int getFacing() {
-    return mFacing;
-  }
-
-  @Override
-  public boolean equals(Object obj) {
-    if (obj instanceof ImageDimensions) {
-      ImageDimensions otherDimensions = (ImageDimensions) obj;
-      return (otherDimensions.getWidth() == getWidth() &&
-              otherDimensions.getHeight() == getHeight() &&
-              otherDimensions.getFacing() == getFacing() &&
-              otherDimensions.getRotation() == getRotation());
-    } else {
-      return super.equals(obj);
-    }
-  }
-}