Multiple Image Capture Result Data (#292)

* init * Update ImageCaptureDeviceTest.kt
google · Dec 13, 2024 · 4c3f981 · 4c3f981
1 parent 31c1e63
commit 4c3f981
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/app/src/androidTest/java/com/google/jetpackcamera/ImageCaptureDeviceTest.kt b/app/src/androidTest/java/com/google/jetpackcamera/ImageCaptureDeviceTest.kt
@@ -209,6 +209,8 @@ internal class ImageCaptureDeviceTest {
                 uiDevice.pressBack()
             }
         Truth.assertThat(result.resultCode).isEqualTo(Activity.RESULT_OK)
+        Truth.assertThat(result.resultData.getStringArrayListExtra(MediaStore.EXTRA_OUTPUT)?.size)
+            .isEqualTo(2)
         deleteFilesInDirAfterTimestamp(DIR_PATH, instrumentation, timeStamp)
     }
 

diff --git a/app/src/main/java/com/google/jetpackcamera/MainActivity.kt b/app/src/main/java/com/google/jetpackcamera/MainActivity.kt
@@ -225,12 +225,24 @@ class MainActivity : ComponentActivity() {
 
                 MediaStore.INTENT_ACTION_STILL_IMAGE_CAMERA -> {
                     val uriList: List<Uri>? = getMultipleExternalCaptureUri()
+                    val pictureTakenUriList: ArrayList<String?> = arrayListOf()
                     PreviewMode.ExternalMultipleImageCaptureMode(
                         uriList
                     ) { event: PreviewViewModel.ImageCaptureEvent, uriIndex: Int ->
                         Log.d(TAG, "onMultipleImageCapture, event: $event")
                         if (uriList == null) {
-                            setResult(RESULT_OK, Intent())
+                            when (event) {
+                                is PreviewViewModel.ImageCaptureEvent.ImageSaved ->
+                                    pictureTakenUriList.add(event.savedUri.toString())
+                                is PreviewViewModel.ImageCaptureEvent.ImageCaptureError ->
+                                    pictureTakenUriList.add(event.exception.toString())
+                            }
+                            val resultIntent = Intent()
+                            resultIntent.putStringArrayListExtra(
+                                MediaStore.EXTRA_OUTPUT,
+                                pictureTakenUriList
+                            )
+                            setResult(RESULT_OK, resultIntent)
                         } else if (uriIndex == uriList.size - 1) {
                             setResult(RESULT_OK, Intent())
                             Log.d(TAG, "onMultipleImageCapture, finish()")