You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by bo...@apache.org on 2012/06/21 23:05:05 UTC
[7/15] android commit: Tacked on file extension to camera file
Tacked on file extension to camera file
Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/commit/7c67f40f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/tree/7c67f40f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/diff/7c67f40f
Branch: refs/heads/master
Commit: 7c67f40fc45dce040608e6d96efa654c7b93ce97
Parents: 167b600
Author: Fil Maj <ma...@gmail.com>
Authored: Wed Jun 20 14:38:22 2012 -0700
Committer: Joe Bowser <bo...@apache.org>
Committed: Thu Jun 21 14:03:58 2012 -0700
----------------------------------------------------------------------
.../src/org/apache/cordova/CameraLauncher.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/7c67f40f/framework/src/org/apache/cordova/CameraLauncher.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/CameraLauncher.java b/framework/src/org/apache/cordova/CameraLauncher.java
index d9467fb..0e86d2c 100755
--- a/framework/src/org/apache/cordova/CameraLauncher.java
+++ b/framework/src/org/apache/cordova/CameraLauncher.java
@@ -353,9 +353,10 @@ public class CameraLauncher extends Plugin implements MediaScannerConnectionClie
}
if (!this.saveToPhotoAlbum) {
File tempFile = new File(this.imageUri.toString());
- Uri jailURI = Uri.fromFile(new File("/data/data/" + this.cordova.getActivity().getPackageName() + "/", tempFile.getName()));
+ Uri jailURI = Uri.fromFile(new File("/data/data/" + this.cordova.getActivity().getPackageName() + "/", tempFile.getName() + "." + (this.encodingType == JPEG ? "jpg" : "png" )));
- // Clean up initial URI before writing out safe URI
+ // Clean up initial URI before writing out safe URI.
+ // First try File-based approach to delete. Then use the media delete method. Neither seem to work on ICS right now...
boolean didWeDeleteIt = tempFile.delete();
if (!didWeDeleteIt) {
int result = this.cordova.getActivity().getContentResolver().delete(
@@ -363,7 +364,6 @@ public class CameraLauncher extends Plugin implements MediaScannerConnectionClie
MediaStore.Images.Media.DATA + " = ?",
new String[] { this.imageUri.toString() }
);
- LOG.d("TAG!","result is " + result);
}
this.imageUri = jailURI;
}