You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ag...@apache.org on 2013/02/14 16:51:25 UTC

android commit: [CB-2213] Add NATIVE_URI to the quick-return logic.

Updated Branches:
  refs/heads/master 674b87057 -> 23938830f


[CB-2213] Add NATIVE_URI to the quick-return logic.


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

Branch: refs/heads/master
Commit: 23938830f7f8c8fe3ed031ae323bbd4008d7d543
Parents: 674b870
Author: Andrew Grieve <ag...@chromium.org>
Authored: Thu Feb 14 10:50:37 2013 -0500
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Thu Feb 14 10:50:37 2013 -0500

----------------------------------------------------------------------
 .../src/org/apache/cordova/CameraLauncher.java     |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-android/blob/23938830/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 9f3a56f..aec0def 100755
--- a/framework/src/org/apache/cordova/CameraLauncher.java
+++ b/framework/src/org/apache/cordova/CameraLauncher.java
@@ -389,9 +389,9 @@ public class CameraLauncher extends CordovaPlugin implements MediaScannerConnect
                 }
                 else {
                     // This is a special case to just return the path as no scaling,
-                    // rotating or compression needs to be done
+                    // rotating, nor compressing needs to be done
                     if (this.targetHeight == -1 && this.targetWidth == -1 &&
-                            this.mQuality == 100 && destType == FILE_URI && !this.correctOrientation) {
+                            (destType == FILE_URI || destType == NATIVE_URI) && !this.correctOrientation) {
                         this.callbackContext.success(uri.toString());
                     } else {
                         // Get the path to the image. Makes loading so much easier.