[[ Bug 22664 ]] Add support for front camera in Android mobilePickPhoto

montegoulding · montegoulding · commit c69b3926fc30 · 2020-04-07T20:26:41.000+10:00
This patch updates `mobilePickPhoto` to handle `front camera` and `rear camera`
enum values for the source parameter.
diff --git a/docs/dictionary/command/mobilePickPhoto.lcdoc b/docs/dictionary/command/mobilePickPhoto.lcdoc
@@ -28,8 +28,8 @@ The source for the image.
 - "library":
 - "album":
 - "camera":
-- "rear camera": iOS only
-- "front camera": iOS only
+- "rear camera":
+- "front camera":
 
 
 maxwidth:
diff --git a/docs/notes/bugfix-22664.md b/docs/notes/bugfix-22664.md
@@ -0,0 +1 @@
+# Support `mobilePickPhoto "front camera"` on Android
diff --git a/engine/src/java/com/runrev/android/Engine.java b/engine/src/java/com/runrev/android/Engine.java
@@ -2080,8 +2080,8 @@ public void showPhotoPicker(String p_source, int p_width, int p_height)
         m_photo_width = p_width;
         m_photo_height = p_height;
         
-        if (p_source.equals("camera"))
-            showCamera();
+        if (p_source.contains("camera"))
+            showCamera(p_source);
         else if (p_source.equals("album"))
             showLibrary();
         else if (p_source.equals("library"))
@@ -2099,7 +2099,7 @@ public void onRequestPermissionsResult(int requestCode, String[] permissions, in
         onAskPermissionDone(grantResults[0] == PackageManager.PERMISSION_GRANTED);
     }
     
-	public void showCamera()
+	public void showCamera(String p_source)
 	{
 		// 2012-01-18-IM temp file may be created in app cache folder, in which case
 		// the file needs to be made world-writable
@@ -2149,6 +2149,20 @@ public void showCamera()
 		t_uri = FileProvider.getProvider(getContext()).addPath(t_path, t_path, "image/jpeg", true, ParcelFileDescriptor.MODE_READ_WRITE);
 
 		Intent t_image_capture = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
+		
+		if (p_source.equals("front camera"))
+		{
+			t_image_capture.putExtra("android.intent.extras.CAMERA_FACING", 1);
+			t_image_capture.putExtra("android.intent.extras.LENS_FACING_FRONT", 1);
+			t_image_capture.putExtra("android.intent.extra.USE_FRONT_CAMERA", true);
+			
+		}
+		else if (p_source.equals("rear camera"))
+		{
+			t_image_capture.putExtra("android.intent.extras.CAMERA_FACING", 0);
+			t_image_capture.putExtra("android.intent.extras.LENS_FACING_FRONT", 0);
+			t_image_capture.putExtra("android.intent.extra.USE_FRONT_CAMERA", false);
+		}
 		t_image_capture.putExtra(MediaStore.EXTRA_OUTPUT, t_uri);
 		t_image_capture.setFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
 		t_activity.startActivityForResult(t_image_capture, IMAGE_RESULT);
diff --git a/engine/src/mblandroidcamera.cpp b/engine/src/mblandroidcamera.cpp
@@ -106,10 +106,12 @@ static const char *MCPhotoSourceTypeToCString(MCPhotoSourceType p_source)
         case kMCPhotoSourceTypeAlbum:
             return "album";
         case kMCPhotoSourceTypeCamera:
-        case kMCPhotoSourceTypeFrontCamera:
-        case kMCPhotoSourceTypeRearCamera:
-            return "camera";
-        default:
+			return "camera";
+		case kMCPhotoSourceTypeRearCamera:
+            return "rear camera";
+		case kMCPhotoSourceTypeFrontCamera:
+			return "front camera";
+		default:
             MCUnreachableReturn("unknown");
     }
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+# Support `mobilePickPhoto "front camera"` on Android