fix(android): handle some resolveWithFailure in AudioActivityResult

apache · Aug 7, 2023 · 0047839 · 0047839
1 parent 273f583
commit 0047839
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/src/android/Capture.java b/src/android/Capture.java
@@ -384,6 +384,11 @@ else if (resultCode == Activity.RESULT_CANCELED) {
     public void onAudioActivityResult(Request req, Intent intent) {
         Uri srcContentUri = intent.getData();
 
+        if (srcContentUri == null) {
+            pendingRequests.resolveWithFailure(req, createErrorObject(CAPTURE_NO_MEDIA_FILES, "Error: data is null"));
+            return;
+        }
+
         // Get file name
         String srcContentUriString = srcContentUri.toString();
         String fileName = srcContentUriString.substring(srcContentUriString.lastIndexOf('/') + 1);
@@ -410,11 +415,12 @@ public void onAudioActivityResult(Request req, Intent intent) {
                     destFOS.write(buf, 0, length);
                 }
             } else {
-                pendingRequests.resolveWithFailure(req, createErrorObject(CAPTURE_NO_MEDIA_FILES, "Error: failed to copy recording to application cache directory."));
+                pendingRequests.resolveWithFailure(req, createErrorObject(CAPTURE_NO_MEDIA_FILES, "Error: failed to create new file to application cache directory."));
                 return;
             }
         } catch (IOException e) {
-            throw new RuntimeException(e);
+            pendingRequests.resolveWithFailure(req, createErrorObject(CAPTURE_NO_MEDIA_FILES, "Error: failed to copy recording to application cache directory."));
+            return;
         }
 
         LOG.d(LOG_TAG, "Recording file path: " + destFile);
@@ -428,7 +434,8 @@ public void onAudioActivityResult(Request req, Intent intent) {
             mediaFile.put("lastModifiedDate", tmpRootFile.lastModified());
             mediaFile.put("size", tmpRootFile.length());
         } catch (JSONException e) {
-            throw new RuntimeException(e);
+            pendingRequests.resolveWithFailure(req, createErrorObject(CAPTURE_INTERNAL_ERR, "Error: no mediaFile created from " + srcContentUri));
+            return;
         }
 
         req.results.put(mediaFile);