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 2013/03/27 23:11:25 UTC

android commit: CB-1796: Let's make sure we actually write the file instead of just writing EXIF to NOTHING

Updated Branches:
  refs/heads/2.6.x ff6ef1eea -> d1932ad47


CB-1796: Let's make sure we actually write the file instead of just writing EXIF to NOTHING


Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/d1932ad4
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/d1932ad4
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/d1932ad4

Branch: refs/heads/2.6.x
Commit: d1932ad473f9673601799161a19e6c1aa6adfed8
Parents: ff6ef1e
Author: Joe Bowser <bo...@apache.org>
Authored: Wed Mar 27 15:11:11 2013 -0700
Committer: Joe Bowser <bo...@apache.org>
Committed: Wed Mar 27 15:11:11 2013 -0700

----------------------------------------------------------------------
 .../src/org/apache/cordova/CameraLauncher.java     |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-android/blob/d1932ad4/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 e0e61ee..22a9b94 100755
--- a/framework/src/org/apache/cordova/CameraLauncher.java
+++ b/framework/src/org/apache/cordova/CameraLauncher.java
@@ -312,10 +312,12 @@ public class CameraLauncher extends CordovaPlugin implements MediaScannerConnect
 
                     // If sending filename back
                     else if (destType == FILE_URI || destType == NATIVE_URI) {
-                        if (!this.saveToPhotoAlbum) {
-                            uri = Uri.fromFile(new File(DirectoryManager.getTempDirectoryPath(this.cordova.getActivity()), System.currentTimeMillis() + ".jpg"));
+                        if (this.saveToPhotoAlbum) {
+                            Uri inputUri = getUriFromMediaStore();
+                            //Just because we have a media URI doesn't mean we have a real file, we need to make it
+                            uri = Uri.fromFile(new File(FileHelper.getRealPath(inputUri, this.cordova)));
                         } else {
-                            uri = getUriFromMediaStore();
+                            uri = Uri.fromFile(new File(DirectoryManager.getTempDirectoryPath(this.cordova.getActivity()), System.currentTimeMillis() + ".jpg"));
                         }
 
                         if (uri == null) {