Skip to content

fix(android): clean up pending camera temp files on cancel/stop #970

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
GitToTheHub wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(android): clean up pending camera temp files on cancel/stop #970

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 36 additions & 0 deletions src/android/CameraLauncher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,6 +327,8 @@ public void stopCamera() {
this.cordova.getActivity().finishActivity((sourceType + 1) * 16 + returnType + 1);
}
}

cleanupPendingResultFiles();
}

public void takePicture(int returnType, int encodingType)
Expand Down Expand Up @@ -901,6 +903,7 @@ public void onActivityResult(int requestCode, int resultCode, Intent intent) {

}// If cancelled
else if (resultCode == Activity.RESULT_CANCELED) {
cleanupPendingResultFiles();
this.failPicture("No Image Selected");
}

Expand Down Expand Up @@ -930,6 +933,7 @@ else if (srcType == CAMERA) {

// If cancelled
else if (resultCode == Activity.RESULT_CANCELED) {
cleanupPendingResultFiles();
this.failPicture("No Image Selected");
}

Expand All @@ -949,6 +953,7 @@ public void run() {
}
});
} else if (resultCode == Activity.RESULT_CANCELED) {
cleanupPendingResultFiles();
this.failPicture("No Image Selected");
} else {
this.failPicture("Selection did not complete!");
Expand Down Expand Up @@ -1214,6 +1219,37 @@ private void cleanup(Uri oldImage, Uri newImage, Bitmap bitmap) {
System.gc();
}

/**
* Best-effort cleanup for temporary files when capture/selection is cancelled or stopped.
*/
private void cleanupPendingResultFiles() {
deleteIfExists(this.imageUri);

@erisu erisu Sep 16, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the imageUri contains a content:// URI, and the deleteIfExists method which uses new File(filePath).delete() would not work as it expects a filesystem path.

I believe we would need to use the ContentResolver to delete the file by passing in the imageUri.

deleteIfExists(this.croppedUri);

if (this.croppedFilePath != null) {
new File(this.croppedFilePath).delete();
this.croppedFilePath = null;
}

this.imageUri = null;
this.croppedUri = null;
}

private void deleteIfExists(Uri uri) {
if (uri == null) {
return;
}

try {
String filePath = FileHelper.stripFileProtocol(uri.toString());
if (filePath != null) {
new File(filePath).delete();
}
} catch (Exception ignored) {
// Best-effort cleanup only.
}
}

/**
* Determine if we are storing the images in internal or external storage
*
Expand Down
Loading