fix(camera): fix camera source on Android (#164)

ionic-team · Dec 28, 2020 · e67f7c6 · e67f7c6
1 parent 8ba0525
commit e67f7c6
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/camera/android/src/main/java/com/capacitorjs/plugins/camera/CameraPlugin.java b/camera/android/src/main/java/com/capacitorjs/plugins/camera/CameraPlugin.java
@@ -87,10 +87,10 @@ public void getPhoto(PluginCall call) {
 
     private void doShow(PluginCall call) {
         switch (settings.getSource()) {
-            case camera:
+            case CAMERA:
                 showCamera(call);
                 break;
-            case photos:
+            case PHOTOS:
                 showPhotos(call);
                 break;
             default:
@@ -111,10 +111,10 @@ private void showPrompt(final PluginCall call) {
             options,
             index -> {
                 if (index == 0) {
-                    settings.setSource(CameraSource.photos);
+                    settings.setSource(CameraSource.PHOTOS);
                     openPhotos(call);
                 } else if (index == 1) {
-                    settings.setSource(CameraSource.camera);
+                    settings.setSource(CameraSource.CAMERA);
                     openCamera(call);
                 }
             },
@@ -189,9 +189,9 @@ private CameraSettings getSettings(PluginCall call) {
         settings.setShouldResize(settings.getWidth() > 0 || settings.getHeight() > 0);
         settings.setShouldCorrectOrientation(call.getBoolean("correctOrientation", CameraSettings.DEFAULT_CORRECT_ORIENTATION));
         try {
-            settings.setSource(CameraSource.valueOf(call.getString("source", CameraSource.prompt.getSource())));
+            settings.setSource(CameraSource.valueOf(call.getString("source", CameraSource.PROMPT.getSource())));
         } catch (IllegalArgumentException ex) {
-            settings.setSource(CameraSource.prompt);
+            settings.setSource(CameraSource.PROMPT);
         }
         return settings;
     }

diff --git a/camera/android/src/main/java/com/capacitorjs/plugins/camera/CameraSettings.java b/camera/android/src/main/java/com/capacitorjs/plugins/camera/CameraSettings.java
@@ -14,7 +14,7 @@ public class CameraSettings {
     private boolean allowEditing = false;
     private int width = 0;
     private int height = 0;
-    private CameraSource source = CameraSource.prompt;
+    private CameraSource source = CameraSource.PROMPT;
 
     public CameraResultType getResultType() {
         return resultType;

diff --git a/camera/android/src/main/java/com/capacitorjs/plugins/camera/CameraSource.java b/camera/android/src/main/java/com/capacitorjs/plugins/camera/CameraSource.java
@@ -1,9 +1,9 @@
 package com.capacitorjs.plugins.camera;
 
 public enum CameraSource {
-    prompt("prompt"),
-    camera("camera"),
-    photos("photos");
+    PROMPT("PROMPT"),
+    CAMERA("CAMERA"),
+    PHOTOS("PHOTOS");
 
     private String source;