You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by st...@apache.org on 2013/09/27 00:24:12 UTC
[01/20] git commit: CB-4633: We really should close cursors. It's
just the right thing to do.
Updated Branches:
refs/heads/master 763e6f0e9 -> fed4f2280
CB-4633: We really should close cursors. It's just the right thing to do.
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/commit/f33e0008
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/tree/f33e0008
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/diff/f33e0008
Branch: refs/heads/master
Commit: f33e00083a853594c5ea0154ae339b87eb677454
Parents: 118ca18
Author: Joe Bowser <bo...@apache.org>
Authored: Wed Sep 4 11:33:35 2013 -0700
Committer: Joe Bowser <bo...@apache.org>
Committed: Wed Sep 4 11:34:13 2013 -0700
----------------------------------------------------------------------
src/android/CameraLauncher.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/f33e0008/src/android/CameraLauncher.java
----------------------------------------------------------------------
diff --git a/src/android/CameraLauncher.java b/src/android/CameraLauncher.java
index 02a9211..7f2f20f 100755
--- a/src/android/CameraLauncher.java
+++ b/src/android/CameraLauncher.java
@@ -749,6 +749,7 @@ public class CameraLauncher extends CordovaPlugin implements MediaScannerConnect
}
Uri uri = Uri.parse(contentStore + "/" + id);
this.cordova.getActivity().getContentResolver().delete(uri, null, null);
+ cursor.close();
}
}
[03/20] git commit: Merge branch 'dev' of
https://git-wip-us.apache.org/repos/asf/cordova-plugin-camera into dev
Posted by st...@apache.org.
Merge branch 'dev' of https://git-wip-us.apache.org/repos/asf/cordova-plugin-camera into dev
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/commit/a9546c4f
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/tree/a9546c4f
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/diff/a9546c4f
Branch: refs/heads/master
Commit: a9546c4f49a5fffd72bcfe30c3aa21ad8c9fe73f
Parents: 763e6f0 f33e000
Author: Andrew Grieve <ag...@chromium.org>
Authored: Fri Sep 6 00:22:17 2013 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Fri Sep 6 00:22:17 2013 -0400
----------------------------------------------------------------------
src/android/CameraLauncher.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
[15/20] git commit: [Windows8] commandProxy has moved
Posted by st...@apache.org.
[Windows8] commandProxy has moved
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/commit/f5a521f5
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/tree/f5a521f5
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/diff/f5a521f5
Branch: refs/heads/master
Commit: f5a521f5eaa505ce9322bc066187da3f55f0a384
Parents: ed86de0
Author: purplecabbage <pu...@gmail.com>
Authored: Tue Sep 24 01:26:11 2013 -0700
Committer: Anis Kadri <an...@apache.org>
Committed: Wed Sep 25 15:02:30 2013 +0200
----------------------------------------------------------------------
src/windows8/CameraProxy.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/f5a521f5/src/windows8/CameraProxy.js
----------------------------------------------------------------------
diff --git a/src/windows8/CameraProxy.js b/src/windows8/CameraProxy.js
index 7c45dc3..16e20f6 100644
--- a/src/windows8/CameraProxy.js
+++ b/src/windows8/CameraProxy.js
@@ -338,4 +338,4 @@ module.exports = {
}
};
-require("cordova/commandProxy").add("Camera",module.exports);
+require("cordova/windows8/commandProxy").add("Camera",module.exports);
[12/20] git commit: CB-4889 renaming org.apache.cordova.core.camera
to org.apache.cordova.camera
Posted by st...@apache.org.
CB-4889 renaming org.apache.cordova.core.camera to org.apache.cordova.camera
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/commit/809a23ff
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/tree/809a23ff
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/diff/809a23ff
Branch: refs/heads/master
Commit: 809a23ffaec3b508489bda4cad26d777c42b5119
Parents: 763e6f0
Author: Anis Kadri <an...@apache.org>
Authored: Sat Sep 21 12:03:08 2013 +0200
Committer: Anis Kadri <an...@apache.org>
Committed: Sat Sep 21 12:03:08 2013 +0200
----------------------------------------------------------------------
plugin.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/809a23ff/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index 18d08e9..cfe33e2 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -2,7 +2,7 @@
<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
xmlns:android="http://schemas.android.com/apk/res/android"
- id="org.apache.cordova.core.camera"
+ id="org.apache.cordova.camera"
version="0.2.1">
<name>Camera</name>
<description>Cordova Camera Plugin</description>
[13/20] git commit: [Windows8] commandProxy has moved
Posted by st...@apache.org.
[Windows8] commandProxy has moved
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/commit/363d1396
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/tree/363d1396
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/diff/363d1396
Branch: refs/heads/master
Commit: 363d139653149e1b515d77b9eba323eaceb40cc0
Parents: 3a3bbb1
Author: purplecabbage <pu...@gmail.com>
Authored: Tue Sep 24 01:26:11 2013 -0700
Committer: purplecabbage <pu...@gmail.com>
Committed: Tue Sep 24 01:26:11 2013 -0700
----------------------------------------------------------------------
src/windows8/CameraProxy.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/363d1396/src/windows8/CameraProxy.js
----------------------------------------------------------------------
diff --git a/src/windows8/CameraProxy.js b/src/windows8/CameraProxy.js
index 7c45dc3..16e20f6 100644
--- a/src/windows8/CameraProxy.js
+++ b/src/windows8/CameraProxy.js
@@ -338,4 +338,4 @@ module.exports = {
}
};
-require("cordova/commandProxy").add("Camera",module.exports);
+require("cordova/windows8/commandProxy").add("Camera",module.exports);
[14/20] git commit: CB-4889
Posted by st...@apache.org.
CB-4889
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/commit/ed86de0d
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/tree/ed86de0d
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/diff/ed86de0d
Branch: refs/heads/master
Commit: ed86de0d2a2dca0e1769e5d959022542d089d251
Parents: 809a23f 3a3bbb1
Author: Anis Kadri <an...@apache.org>
Authored: Wed Sep 25 15:02:03 2013 +0200
Committer: Anis Kadri <an...@apache.org>
Committed: Wed Sep 25 15:02:03 2013 +0200
----------------------------------------------------------------------
CHANGELOG.md | 25 -----
RELEASENOTES.md | 25 +++++
plugin.xml | 20 +++-
src/android/CameraLauncher.java | 49 +++++-----
src/android/ExifHelper.java | 185 +++++++++++++++++++++++++++++++++++
src/android/FileHelper.java | 158 ++++++++++++++++++++++++++++++
src/firefoxos/CameraProxy.js | 52 ++++++++++
src/ios/CDVCamera.m | 4 +-
8 files changed, 463 insertions(+), 55 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/ed86de0d/plugin.xml
----------------------------------------------------------------------
diff --cc plugin.xml
index cfe33e2,dbf89d4..e4fb3ba
--- a/plugin.xml
+++ b/plugin.xml
@@@ -2,8 -2,8 +2,8 @@@
<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
xmlns:android="http://schemas.android.com/apk/res/android"
- id="org.apache.cordova.core.camera"
+ id="org.apache.cordova.camera"
- version="0.2.1">
+ version="0.2.2-dev">
<name>Camera</name>
<description>Cordova Camera Plugin</description>
<license>Apache 2.0</license>
@@@ -122,9 -124,9 +124,7 @@@
<!-- windows8 -->
<platform name="windows8">
-- <dependency id="org.apache.cordova.core.file"
-- url="https://git-wip-us.apache.org/repos/asf/cordova-plugin-file"
-- commit="master" subdir="/" />
++ <dependency id="org.apache.cordova.file" />
<config-file target="package.appxmanifest" parent="/Package/Capabilities">
<Capability Name="picturesLibrary" />
<DeviceCapability Name="webcam" />
[19/20] git commit: CB-4889 bumping&resetting version
Posted by st...@apache.org.
CB-4889 bumping&resetting version
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/commit/c42bfe88
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/tree/c42bfe88
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/diff/c42bfe88
Branch: refs/heads/master
Commit: c42bfe881f8c7d3c25abd080d04b6b25cf70a9cd
Parents: 200d683
Author: Anis Kadri <an...@apache.org>
Authored: Wed Sep 25 17:49:48 2013 +0200
Committer: Anis Kadri <an...@apache.org>
Committed: Wed Sep 25 17:49:48 2013 +0200
----------------------------------------------------------------------
plugin.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/c42bfe88/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index e4fb3ba..7e10d49 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -3,7 +3,7 @@
<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
xmlns:android="http://schemas.android.com/apk/res/android"
id="org.apache.cordova.camera"
- version="0.2.2-dev">
+ version="0.2.3-dev">
<name>Camera</name>
<description>Cordova Camera Plugin</description>
<license>Apache 2.0</license>
[09/20] git commit: [CB-4823] Fix XCode 5 camera plugin warnings
Posted by st...@apache.org.
[CB-4823] Fix XCode 5 camera plugin warnings
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/commit/9bcf725e
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/tree/9bcf725e
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/diff/9bcf725e
Branch: refs/heads/master
Commit: 9bcf725e393e76502253f01b28399c1fa6bd6b5c
Parents: 224e7cf
Author: James Jong <wj...@gmail.com>
Authored: Mon Sep 16 15:13:35 2013 -0400
Committer: James Jong <wj...@gmail.com>
Committed: Mon Sep 16 15:13:35 2013 -0400
----------------------------------------------------------------------
src/ios/CDVCamera.m | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/9bcf725e/src/ios/CDVCamera.m
----------------------------------------------------------------------
diff --git a/src/ios/CDVCamera.m b/src/ios/CDVCamera.m
index e0f195f..19f8148 100644
--- a/src/ios/CDVCamera.m
+++ b/src/ios/CDVCamera.m
@@ -150,9 +150,11 @@ static NSSet* org_apache_cordova_validArrowDirections;
NSDictionary* options = [command.arguments objectAtIndex:10 withDefault:nil];
[self displayPopover:options];
} else {
- if ([self.viewController respondsToSelector:@selector(presentViewController:::)]) {
+ SEL selector = NSSelectorFromString(@"presentViewController:animated:completion:");
+ if ([self.viewController respondsToSelector:selector]) {
[self.viewController presentViewController:cameraPicker animated:YES completion:nil];
} else {
+ // deprecated as of iOS >= 6.0
[self.viewController presentModalViewController:cameraPicker animated:YES];
}
}
[11/20] git commit: added Camera API for FirefoxOS
Posted by st...@apache.org.
added Camera API for FirefoxOS
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/commit/3a3bbb1c
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/tree/3a3bbb1c
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/diff/3a3bbb1c
Branch: refs/heads/master
Commit: 3a3bbb1cc9bfe4d04a560bf86bead1fd01a2904f
Parents: 8077d30
Author: Herm Wong <he...@gmail.com>
Authored: Wed Sep 18 16:22:13 2013 -0700
Committer: Herm Wong <he...@gmail.com>
Committed: Wed Sep 18 16:22:13 2013 -0700
----------------------------------------------------------------------
plugin.xml | 12 +++++++++
src/firefoxos/CameraProxy.js | 52 +++++++++++++++++++++++++++++++++++++++
2 files changed, 64 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/3a3bbb1c/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index 7f58841..dbf89d4 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -139,5 +139,17 @@
</js-module>
</platform>
+
+ <!-- firefoxos -->
+ <platform name="firefoxos">
+ <config-file target="config.xml" parent="/*">
+ <feature name="Camera">
+ <param name="firefoxos-package" value="Camera" />
+ </feature>
+ </config-file>
+ <js-module src="src/firefoxos/CameraProxy.js" name="CameraProxy">
+ <runs />
+ </js-module>
+ </platform>
</plugin>
http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/3a3bbb1c/src/firefoxos/CameraProxy.js
----------------------------------------------------------------------
diff --git a/src/firefoxos/CameraProxy.js b/src/firefoxos/CameraProxy.js
new file mode 100644
index 0000000..bbed304
--- /dev/null
+++ b/src/firefoxos/CameraProxy.js
@@ -0,0 +1,52 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+*/
+
+
+
+function getPicture(cameraSuccess, cameraError, cameraOptions) {
+ cameraError = cameraError || function(){};
+ var pick = new MozActivity({
+ name: "pick",
+ data: {
+ type: ["image/png", "image/jpg", "image/jpeg"]
+ }
+ });
+ pick.onerror = cameraError;
+ pick.onsuccess = function() {
+ // image is returned as Blob in this.result.blob
+ // we need to call cameraSuccess with url or base64 encoded image
+ if (cameraOptions && cameraOptions.destinationType == 0) {
+ // TODO: base64
+ return;
+ }
+ if (!cameraOptions || !cameraOptions.destinationType || cameraOptions.destinationType > 0) {
+ // url
+ return cameraSuccess(window.URL.createObjectURL(this.result.blob));
+ }
+ };
+}
+
+module.exports = {
+ getPicture: getPicture,
+ cleanup: function(){}
+};
+
+require("cordova/firefoxos/commandProxy").add("Camera", module.exports);
\ No newline at end of file
[10/20] git commit: Rename CHANGELOG.md -> RELEASENOTES.md
Posted by st...@apache.org.
Rename CHANGELOG.md -> RELEASENOTES.md
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/commit/8077d302
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/tree/8077d302
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/diff/8077d302
Branch: refs/heads/master
Commit: 8077d302fefea25b77d853eaf388cddddea7a12b
Parents: 9bcf725
Author: Andrew Grieve <ag...@chromium.org>
Authored: Tue Sep 17 11:36:13 2013 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Tue Sep 17 11:36:13 2013 -0400
----------------------------------------------------------------------
CHANGELOG.md | 25 -------------------------
RELEASENOTES.md | 25 +++++++++++++++++++++++++
2 files changed, 25 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/8077d302/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
deleted file mode 100644
index bae12ec..0000000
--- a/CHANGELOG.md
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
--->
-# Release Notes
-
-### 0.2.1 (Sept 5, 2013)
-* [CB-4656] Don't add line-breaks to base64-encoded images (Fixes type=DataURI)
-* [CB-4432] copyright notice change
http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/8077d302/RELEASENOTES.md
----------------------------------------------------------------------
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
new file mode 100644
index 0000000..bae12ec
--- /dev/null
+++ b/RELEASENOTES.md
@@ -0,0 +1,25 @@
+<!--
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+-->
+# Release Notes
+
+### 0.2.1 (Sept 5, 2013)
+* [CB-4656] Don't add line-breaks to base64-encoded images (Fixes type=DataURI)
+* [CB-4432] copyright notice change
[07/20] git commit: [CB-4765] Move ExifHelper.java into Camera Plugin
Posted by st...@apache.org.
[CB-4765] Move ExifHelper.java into Camera Plugin
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/commit/bc32c501
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/tree/bc32c501
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/diff/bc32c501
Branch: refs/heads/master
Commit: bc32c501daea502009bac4f83e06531846534f6c
Parents: df028dd
Author: Andrew Grieve <ag...@chromium.org>
Authored: Mon Sep 9 16:14:48 2013 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Mon Sep 9 16:15:16 2013 -0400
----------------------------------------------------------------------
plugin.xml | 1 +
src/android/CameraLauncher.java | 1 -
src/android/ExifHelper.java | 185 +++++++++++++++++++++++++++++++++++
3 files changed, 186 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/bc32c501/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index d31a5a7..7f58841 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -36,6 +36,7 @@
<source-file src="src/android/CameraLauncher.java" target-dir="src/org/apache/cordova/camera" />
<source-file src="src/android/FileHelper.java" target-dir="src/org/apache/cordova/camera" />
+ <source-file src="src/android/ExifHelper.java" target-dir="src/org/apache/cordova/camera" />
<js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle">
<clobbers target="CameraPopoverHandle" />
http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/bc32c501/src/android/CameraLauncher.java
----------------------------------------------------------------------
diff --git a/src/android/CameraLauncher.java b/src/android/CameraLauncher.java
index 4d01179..ec8222d 100755
--- a/src/android/CameraLauncher.java
+++ b/src/android/CameraLauncher.java
@@ -26,7 +26,6 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStream;
-import org.apache.cordova.ExifHelper;
import org.apache.cordova.CallbackContext;
import org.apache.cordova.CordovaPlugin;
import org.apache.cordova.LOG;
http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/bc32c501/src/android/ExifHelper.java
----------------------------------------------------------------------
diff --git a/src/android/ExifHelper.java b/src/android/ExifHelper.java
new file mode 100644
index 0000000..5160a2f
--- /dev/null
+++ b/src/android/ExifHelper.java
@@ -0,0 +1,185 @@
+/*
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+*/
+package org.apache.cordova.camera;
+
+import java.io.IOException;
+
+import android.media.ExifInterface;
+
+public class ExifHelper {
+ private String aperture = null;
+ private String datetime = null;
+ private String exposureTime = null;
+ private String flash = null;
+ private String focalLength = null;
+ private String gpsAltitude = null;
+ private String gpsAltitudeRef = null;
+ private String gpsDateStamp = null;
+ private String gpsLatitude = null;
+ private String gpsLatitudeRef = null;
+ private String gpsLongitude = null;
+ private String gpsLongitudeRef = null;
+ private String gpsProcessingMethod = null;
+ private String gpsTimestamp = null;
+ private String iso = null;
+ private String make = null;
+ private String model = null;
+ private String orientation = null;
+ private String whiteBalance = null;
+
+ private ExifInterface inFile = null;
+ private ExifInterface outFile = null;
+
+ /**
+ * The file before it is compressed
+ *
+ * @param filePath
+ * @throws IOException
+ */
+ public void createInFile(String filePath) throws IOException {
+ this.inFile = new ExifInterface(filePath);
+ }
+
+ /**
+ * The file after it has been compressed
+ *
+ * @param filePath
+ * @throws IOException
+ */
+ public void createOutFile(String filePath) throws IOException {
+ this.outFile = new ExifInterface(filePath);
+ }
+
+ /**
+ * Reads all the EXIF data from the input file.
+ */
+ public void readExifData() {
+ this.aperture = inFile.getAttribute(ExifInterface.TAG_APERTURE);
+ this.datetime = inFile.getAttribute(ExifInterface.TAG_DATETIME);
+ this.exposureTime = inFile.getAttribute(ExifInterface.TAG_EXPOSURE_TIME);
+ this.flash = inFile.getAttribute(ExifInterface.TAG_FLASH);
+ this.focalLength = inFile.getAttribute(ExifInterface.TAG_FOCAL_LENGTH);
+ this.gpsAltitude = inFile.getAttribute(ExifInterface.TAG_GPS_ALTITUDE);
+ this.gpsAltitudeRef = inFile.getAttribute(ExifInterface.TAG_GPS_ALTITUDE_REF);
+ this.gpsDateStamp = inFile.getAttribute(ExifInterface.TAG_GPS_DATESTAMP);
+ this.gpsLatitude = inFile.getAttribute(ExifInterface.TAG_GPS_LATITUDE);
+ this.gpsLatitudeRef = inFile.getAttribute(ExifInterface.TAG_GPS_LATITUDE_REF);
+ this.gpsLongitude = inFile.getAttribute(ExifInterface.TAG_GPS_LONGITUDE);
+ this.gpsLongitudeRef = inFile.getAttribute(ExifInterface.TAG_GPS_LONGITUDE_REF);
+ this.gpsProcessingMethod = inFile.getAttribute(ExifInterface.TAG_GPS_PROCESSING_METHOD);
+ this.gpsTimestamp = inFile.getAttribute(ExifInterface.TAG_GPS_TIMESTAMP);
+ this.iso = inFile.getAttribute(ExifInterface.TAG_ISO);
+ this.make = inFile.getAttribute(ExifInterface.TAG_MAKE);
+ this.model = inFile.getAttribute(ExifInterface.TAG_MODEL);
+ this.orientation = inFile.getAttribute(ExifInterface.TAG_ORIENTATION);
+ this.whiteBalance = inFile.getAttribute(ExifInterface.TAG_WHITE_BALANCE);
+ }
+
+ /**
+ * Writes the previously stored EXIF data to the output file.
+ *
+ * @throws IOException
+ */
+ public void writeExifData() throws IOException {
+ // Don't try to write to a null file
+ if (this.outFile == null) {
+ return;
+ }
+
+ if (this.aperture != null) {
+ this.outFile.setAttribute(ExifInterface.TAG_APERTURE, this.aperture);
+ }
+ if (this.datetime != null) {
+ this.outFile.setAttribute(ExifInterface.TAG_DATETIME, this.datetime);
+ }
+ if (this.exposureTime != null) {
+ this.outFile.setAttribute(ExifInterface.TAG_EXPOSURE_TIME, this.exposureTime);
+ }
+ if (this.flash != null) {
+ this.outFile.setAttribute(ExifInterface.TAG_FLASH, this.flash);
+ }
+ if (this.focalLength != null) {
+ this.outFile.setAttribute(ExifInterface.TAG_FOCAL_LENGTH, this.focalLength);
+ }
+ if (this.gpsAltitude != null) {
+ this.outFile.setAttribute(ExifInterface.TAG_GPS_ALTITUDE, this.gpsAltitude);
+ }
+ if (this.gpsAltitudeRef != null) {
+ this.outFile.setAttribute(ExifInterface.TAG_GPS_ALTITUDE_REF, this.gpsAltitudeRef);
+ }
+ if (this.gpsDateStamp != null) {
+ this.outFile.setAttribute(ExifInterface.TAG_GPS_DATESTAMP, this.gpsDateStamp);
+ }
+ if (this.gpsLatitude != null) {
+ this.outFile.setAttribute(ExifInterface.TAG_GPS_LATITUDE, this.gpsLatitude);
+ }
+ if (this.gpsLatitudeRef != null) {
+ this.outFile.setAttribute(ExifInterface.TAG_GPS_LATITUDE_REF, this.gpsLatitudeRef);
+ }
+ if (this.gpsLongitude != null) {
+ this.outFile.setAttribute(ExifInterface.TAG_GPS_LONGITUDE, this.gpsLongitude);
+ }
+ if (this.gpsLongitudeRef != null) {
+ this.outFile.setAttribute(ExifInterface.TAG_GPS_LONGITUDE_REF, this.gpsLongitudeRef);
+ }
+ if (this.gpsProcessingMethod != null) {
+ this.outFile.setAttribute(ExifInterface.TAG_GPS_PROCESSING_METHOD, this.gpsProcessingMethod);
+ }
+ if (this.gpsTimestamp != null) {
+ this.outFile.setAttribute(ExifInterface.TAG_GPS_TIMESTAMP, this.gpsTimestamp);
+ }
+ if (this.iso != null) {
+ this.outFile.setAttribute(ExifInterface.TAG_ISO, this.iso);
+ }
+ if (this.make != null) {
+ this.outFile.setAttribute(ExifInterface.TAG_MAKE, this.make);
+ }
+ if (this.model != null) {
+ this.outFile.setAttribute(ExifInterface.TAG_MODEL, this.model);
+ }
+ if (this.orientation != null) {
+ this.outFile.setAttribute(ExifInterface.TAG_ORIENTATION, this.orientation);
+ }
+ if (this.whiteBalance != null) {
+ this.outFile.setAttribute(ExifInterface.TAG_WHITE_BALANCE, this.whiteBalance);
+ }
+
+ this.outFile.saveAttributes();
+ }
+
+ public int getOrientation() {
+ int o = Integer.parseInt(this.orientation);
+
+ if (o == ExifInterface.ORIENTATION_NORMAL) {
+ return 0;
+ } else if (o == ExifInterface.ORIENTATION_ROTATE_90) {
+ return 90;
+ } else if (o == ExifInterface.ORIENTATION_ROTATE_180) {
+ return 180;
+ } else if (o == ExifInterface.ORIENTATION_ROTATE_270) {
+ return 270;
+ } else {
+ return 0;
+ }
+ }
+
+ public void resetOrientation() {
+ this.orientation = "" + ExifInterface.ORIENTATION_NORMAL;
+ }
+}
[20/20] git commit: [CB-4915] Updated version and RELEASENOTES.md for
release 0.2.3
Posted by st...@apache.org.
[CB-4915] Updated version and RELEASENOTES.md for release 0.2.3
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/commit/fed4f228
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/tree/fed4f228
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/diff/fed4f228
Branch: refs/heads/master
Commit: fed4f2280d786cabb24641eb6ce686acf98d0a94
Parents: c42bfe8
Author: Steven Gill <st...@gmail.com>
Authored: Wed Sep 25 16:55:49 2013 -0700
Committer: Steven Gill <st...@gmail.com>
Committed: Wed Sep 25 16:55:49 2013 -0700
----------------------------------------------------------------------
RELEASENOTES.md | 18 ++++++++++++++++++
plugin.xml | 2 +-
2 files changed, 19 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/fed4f228/RELEASENOTES.md
----------------------------------------------------------------------
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index bae12ec..d130307 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -23,3 +23,21 @@
### 0.2.1 (Sept 5, 2013)
* [CB-4656] Don't add line-breaks to base64-encoded images (Fixes type=DataURI)
* [CB-4432] copyright notice change
+
+### 0.2.3 (Sept 25, 2013)
+* CB-4889 bumping&resetting version
+* CB-4889 forgot index.html
+* CB-4889 renaming core inside cameraProxy
+* [Windows8] commandProxy has moved
+* [Windows8] commandProxy has moved
+* added Camera API for FirefoxOS
+* Rename CHANGELOG.md -> RELEASENOTES.md
+* [CB-4823] Fix XCode 5 camera plugin warnings
+* Fix compiler warnings
+* [CB-4765] Move ExifHelper.java into Camera Plugin
+* [CB-4764] Remove reference to DirectoryManager from CameraLauncher
+* [CB-4763] Use a copy of FileHelper.java within camera-plugin.
+* [CB-4752] Incremented plugin version on dev branch.
+* CB-4633: We really should close cursors. It's just the right thing to do.
+* No longer causes a stack trace, but it doesn't cause the error to be called.
+* CB-4889 renaming org.apache.cordova.core.camera to org.apache.cordova.camera
http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/fed4f228/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index 7e10d49..1327534 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -3,7 +3,7 @@
<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
xmlns:android="http://schemas.android.com/apk/res/android"
id="org.apache.cordova.camera"
- version="0.2.3-dev">
+ version="0.2.3">
<name>Camera</name>
<description>Cordova Camera Plugin</description>
<license>Apache 2.0</license>
[06/20] git commit: [CB-4764] Remove reference to DirectoryManager
from CameraLauncher
Posted by st...@apache.org.
[CB-4764] Remove reference to DirectoryManager from CameraLauncher
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/commit/df028dd2
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/tree/df028dd2
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/diff/df028dd2
Branch: refs/heads/master
Commit: df028dd2571ab8fd1032a20b0f55ca2b32e8c0b9
Parents: 44517ea
Author: Andrew Grieve <ag...@chromium.org>
Authored: Mon Sep 9 16:03:36 2013 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Mon Sep 9 16:10:16 2013 -0400
----------------------------------------------------------------------
src/android/CameraLauncher.java | 46 ++++++++++++++++++------------------
1 file changed, 23 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/df028dd2/src/android/CameraLauncher.java
----------------------------------------------------------------------
diff --git a/src/android/CameraLauncher.java b/src/android/CameraLauncher.java
index c8961f6..4d01179 100755
--- a/src/android/CameraLauncher.java
+++ b/src/android/CameraLauncher.java
@@ -27,7 +27,6 @@ import java.io.IOException;
import java.io.OutputStream;
import org.apache.cordova.ExifHelper;
-import org.apache.cordova.DirectoryManager;
import org.apache.cordova.CallbackContext;
import org.apache.cordova.CordovaPlugin;
import org.apache.cordova.LOG;
@@ -94,23 +93,6 @@ public class CameraLauncher extends CordovaPlugin implements MediaScannerConnect
private MediaScannerConnection conn; // Used to update gallery app with newly-written files
private Uri scanMe; // Uri of image to be added to content store
- //This should never be null!
- //private CordovaInterface cordova;
-
- /**
- * Constructor.
- */
- public CameraLauncher() {
- }
-
-// public void setContext(CordovaInterface mCtx) {
-// super.setContext(mCtx);
-// if (CordovaInterface.class.isInstance(mCtx))
-// cordova = (CordovaInterface) mCtx;
-// else
-// LOG.d(LOG_TAG, "ERROR: You must use the CordovaInterface for this to work correctly. Please implement it in your activity");
-// }
-
/**
* Executes the request and returns PluginResult.
*
@@ -181,6 +163,24 @@ public class CameraLauncher extends CordovaPlugin implements MediaScannerConnect
// LOCAL METHODS
//--------------------------------------------------------------------------
+ private String getTempDirectoryPath() {
+ File cache = null;
+
+ // SD Card Mounted
+ if (Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) {
+ cache = new File(Environment.getExternalStorageDirectory().getAbsolutePath() +
+ "/Android/data/" + cordova.getActivity().getPackageName() + "/cache/");
+ }
+ // Use internal storage
+ else {
+ cache = cordova.getActivity().getCacheDir();
+ }
+
+ // Create the cache directory if it doesn't exist
+ cache.mkdirs();
+ return cache.getAbsolutePath();
+ }
+
/**
* Take a picture with the camera.
* When an image is captured or the camera view is cancelled, the result is returned
@@ -223,9 +223,9 @@ public class CameraLauncher extends CordovaPlugin implements MediaScannerConnect
private File createCaptureFile(int encodingType) {
File photo = null;
if (encodingType == JPEG) {
- photo = new File(DirectoryManager.getTempDirectoryPath(this.cordova.getActivity()), ".Pic.jpg");
+ photo = new File(getTempDirectoryPath(), ".Pic.jpg");
} else if (encodingType == PNG) {
- photo = new File(DirectoryManager.getTempDirectoryPath(this.cordova.getActivity()), ".Pic.png");
+ photo = new File(getTempDirectoryPath(), ".Pic.png");
} else {
throw new IllegalArgumentException("Invalid Encoding Type: " + encodingType);
}
@@ -289,7 +289,7 @@ public class CameraLauncher extends CordovaPlugin implements MediaScannerConnect
ExifHelper exif = new ExifHelper();
try {
if (this.encodingType == JPEG) {
- exif.createInFile(DirectoryManager.getTempDirectoryPath(this.cordova.getActivity()) + "/.Pic.jpg");
+ exif.createInFile(getTempDirectoryPath() + "/.Pic.jpg");
exif.readExifData();
rotate = exif.getOrientation();
}
@@ -330,7 +330,7 @@ public class CameraLauncher extends CordovaPlugin implements MediaScannerConnect
//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 = Uri.fromFile(new File(DirectoryManager.getTempDirectoryPath(this.cordova.getActivity()), System.currentTimeMillis() + ".jpg"));
+ uri = Uri.fromFile(new File(getTempDirectoryPath(), System.currentTimeMillis() + ".jpg"));
}
if (uri == null) {
@@ -450,7 +450,7 @@ public class CameraLauncher extends CordovaPlugin implements MediaScannerConnect
if (this.targetHeight > 0 && this.targetWidth > 0) {
try {
// Create an ExifHelper to save the exif data that is lost during compression
- String resizePath = DirectoryManager.getTempDirectoryPath(this.cordova.getActivity()) + "/resize.jpg";
+ String resizePath = getTempDirectoryPath() + "/resize.jpg";
// Some content: URIs do not map to file paths (e.g. picasa).
String realPath = FileHelper.getRealPath(uri, this.cordova);
ExifHelper exif = new ExifHelper();
[02/20] git commit: No longer causes a stack trace,
but it doesn't cause the error to be called.
Posted by st...@apache.org.
No longer causes a stack trace, but it doesn't cause the error to be called.
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/commit/118ca18d
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/tree/118ca18d
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/diff/118ca18d
Branch: refs/heads/master
Commit: 118ca18d5a7d77dfe37c5c9a85350a7890448de9
Parents: 382e942
Author: Joe Bowser <bo...@apache.org>
Authored: Wed Aug 21 15:39:43 2013 -0700
Committer: Joe Bowser <bo...@apache.org>
Committed: Wed Sep 4 11:34:13 2013 -0700
----------------------------------------------------------------------
src/android/CameraLauncher.java | 21 ++++++++++++++++-----
1 file changed, 16 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/118ca18d/src/android/CameraLauncher.java
----------------------------------------------------------------------
diff --git a/src/android/CameraLauncher.java b/src/android/CameraLauncher.java
index ba432cb..02a9211 100755
--- a/src/android/CameraLauncher.java
+++ b/src/android/CameraLauncher.java
@@ -76,7 +76,7 @@ public class CameraLauncher extends CordovaPlugin implements MediaScannerConnect
private static final String GET_PICTURE = "Get Picture";
private static final String GET_VIDEO = "Get Video";
private static final String GET_All = "Get All";
-
+
private static final String LOG_TAG = "CameraLauncher";
private int mQuality; // Compression quality hint (0-100: 0=low quality & high compression, 100=compress of max quality)
@@ -153,15 +153,26 @@ public class CameraLauncher extends CordovaPlugin implements MediaScannerConnect
this.targetHeight = -1;
}
- if (srcType == CAMERA) {
- this.takePicture(destType, encodingType);
+ try {
+ if (srcType == CAMERA) {
+ this.takePicture(destType, encodingType);
+ }
+ else if ((srcType == PHOTOLIBRARY) || (srcType == SAVEDPHOTOALBUM)) {
+ this.getImage(srcType, destType);
+ }
}
- else if ((srcType == PHOTOLIBRARY) || (srcType == SAVEDPHOTOALBUM)) {
- this.getImage(srcType, destType);
+ catch (IllegalArgumentException e)
+ {
+ callbackContext.error("Illegal Argument Exception");
+ PluginResult r = new PluginResult(PluginResult.Status.ERROR);
+ callbackContext.sendPluginResult(r);
+ return true;
}
+
PluginResult r = new PluginResult(PluginResult.Status.NO_RESULT);
r.setKeepCallback(true);
callbackContext.sendPluginResult(r);
+
return true;
}
return false;
[18/20] git commit: CB-4889 forgot index.html
Posted by st...@apache.org.
CB-4889 forgot index.html
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/commit/200d6833
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/tree/200d6833
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/diff/200d6833
Branch: refs/heads/master
Commit: 200d6833f90c24e02da5726698f9a1b8fc0240e0
Parents: 6a1a558
Author: Anis Kadri <an...@apache.org>
Authored: Wed Sep 25 15:39:02 2013 +0200
Committer: Anis Kadri <an...@apache.org>
Committed: Wed Sep 25 15:39:02 2013 +0200
----------------------------------------------------------------------
test/camera/index.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/200d6833/test/camera/index.html
----------------------------------------------------------------------
diff --git a/test/camera/index.html b/test/camera/index.html
index 83285e7..2495a16 100644
--- a/test/camera/index.html
+++ b/test/camera/index.html
@@ -340,7 +340,7 @@
document.addEventListener("deviceready", function() {
deviceReady = true;
platformId = cordova.require('cordova/platform').id;
- CameraPopoverOptions = cordova.require('org.apache.cordova.core.camera.CameraPopoverOptions');
+ CameraPopoverOptions = cordova.require('org.apache.cordova.camera.CameraPopoverOptions');
console.log("Device="+device.platform+" "+device.version);
createOptionsEl('sourceType', Camera.PictureSourceType, camPictureSourceTypeDefault);
createOptionsEl('destinationType', Camera.DestinationType, camDestinationTypeDefault);
[05/20] git commit: [CB-4763] Use a copy of FileHelper.java within
camera-plugin.
Posted by st...@apache.org.
[CB-4763] Use a copy of FileHelper.java within camera-plugin.
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/commit/44517ea9
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/tree/44517ea9
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/diff/44517ea9
Branch: refs/heads/master
Commit: 44517ea93f705152cd91bbafdb849a53a7d6804d
Parents: 8c77ddb
Author: Andrew Grieve <ag...@chromium.org>
Authored: Mon Sep 9 15:10:40 2013 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Mon Sep 9 15:10:40 2013 -0400
----------------------------------------------------------------------
plugin.xml | 1 +
src/android/CameraLauncher.java | 1 -
src/android/FileHelper.java | 162 +++++++++++++++++++++++++++++++++++
3 files changed, 163 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/44517ea9/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index dcc7910..d31a5a7 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -35,6 +35,7 @@
</config-file>
<source-file src="src/android/CameraLauncher.java" target-dir="src/org/apache/cordova/camera" />
+ <source-file src="src/android/FileHelper.java" target-dir="src/org/apache/cordova/camera" />
<js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle">
<clobbers target="CameraPopoverHandle" />
http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/44517ea9/src/android/CameraLauncher.java
----------------------------------------------------------------------
diff --git a/src/android/CameraLauncher.java b/src/android/CameraLauncher.java
index 7f2f20f..c8961f6 100755
--- a/src/android/CameraLauncher.java
+++ b/src/android/CameraLauncher.java
@@ -28,7 +28,6 @@ import java.io.OutputStream;
import org.apache.cordova.ExifHelper;
import org.apache.cordova.DirectoryManager;
-import org.apache.cordova.FileHelper;
import org.apache.cordova.CallbackContext;
import org.apache.cordova.CordovaPlugin;
import org.apache.cordova.LOG;
http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/44517ea9/src/android/FileHelper.java
----------------------------------------------------------------------
diff --git a/src/android/FileHelper.java b/src/android/FileHelper.java
new file mode 100644
index 0000000..fb7fc6f
--- /dev/null
+++ b/src/android/FileHelper.java
@@ -0,0 +1,162 @@
+/*
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.cordova.camera;
+
+import android.database.Cursor;
+import android.net.Uri;
+import android.webkit.MimeTypeMap;
+
+import org.apache.cordova.CordovaInterface;
+import org.apache.cordova.LOG;
+
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.charset.Charset;
+import java.util.Locale;
+
+public class FileHelper {
+ private static final String LOG_TAG = "FileUtils";
+ private static final String _DATA = "_data";
+
+ /**
+ * Returns the real path of the given URI string.
+ * If the given URI string represents a content:// URI, the real path is retrieved from the media store.
+ *
+ * @param uriString the URI string of the audio/image/video
+ * @param cordova the current application context
+ * @return the full path to the file
+ */
+ @SuppressWarnings("deprecation")
+ public static String getRealPath(String uriString, CordovaInterface cordova) {
+ String realPath = null;
+
+ if (uriString.startsWith("content://")) {
+ String[] proj = { _DATA };
+ Cursor cursor = cordova.getActivity().managedQuery(Uri.parse(uriString), proj, null, null, null);
+ int column_index = cursor.getColumnIndexOrThrow(_DATA);
+ cursor.moveToFirst();
+ realPath = cursor.getString(column_index);
+ if (realPath == null) {
+ LOG.e(LOG_TAG, "Could get real path for URI string %s", uriString);
+ }
+ } else if (uriString.startsWith("file://")) {
+ realPath = uriString.substring(7);
+ if (realPath.startsWith("/android_asset/")) {
+ LOG.e(LOG_TAG, "Cannot get real path for URI string %s because it is a file:///android_asset/ URI.", uriString);
+ realPath = null;
+ }
+ } else {
+ realPath = uriString;
+ }
+
+ return realPath;
+ }
+
+ /**
+ * Returns the real path of the given URI.
+ * If the given URI is a content:// URI, the real path is retrieved from the media store.
+ *
+ * @param uri the URI of the audio/image/video
+ * @param cordova the current application context
+ * @return the full path to the file
+ */
+ public static String getRealPath(Uri uri, CordovaInterface cordova) {
+ return FileHelper.getRealPath(uri.toString(), cordova);
+ }
+
+ /**
+ * Returns an input stream based on given URI string.
+ *
+ * @param uriString the URI string from which to obtain the input stream
+ * @param cordova the current application context
+ * @return an input stream into the data at the given URI or null if given an invalid URI string
+ * @throws IOException
+ */
+ public static InputStream getInputStreamFromUriString(String uriString, CordovaInterface cordova) throws IOException {
+ if (uriString.startsWith("content")) {
+ Uri uri = Uri.parse(uriString);
+ return cordova.getActivity().getContentResolver().openInputStream(uri);
+ } else if (uriString.startsWith("file://")) {
+ int question = uriString.indexOf("?");
+ if (question > -1) {
+ uriString = uriString.substring(0,question);
+ }
+ if (uriString.startsWith("file:///android_asset/")) {
+ Uri uri = Uri.parse(uriString);
+ String relativePath = uri.getPath().substring(15);
+ return cordova.getActivity().getAssets().open(relativePath);
+ } else {
+ return new FileInputStream(getRealPath(uriString, cordova));
+ }
+ } else {
+ return new FileInputStream(getRealPath(uriString, cordova));
+ }
+ }
+
+ /**
+ * Removes the "file://" prefix from the given URI string, if applicable.
+ * If the given URI string doesn't have a "file://" prefix, it is returned unchanged.
+ *
+ * @param uriString the URI string to operate on
+ * @return a path without the "file://" prefix
+ */
+ public static String stripFileProtocol(String uriString) {
+ if (uriString.startsWith("file://")) {
+ uriString = uriString.substring(7);
+ }
+ return uriString;
+ }
+
+ public static String getMimeTypeForExtension(String path) {
+ String extension = path;
+ int lastDot = extension.lastIndexOf('.');
+ if (lastDot != -1) {
+ extension = extension.substring(lastDot + 1);
+ }
+ // Convert the URI string to lower case to ensure compatibility with MimeTypeMap (see CB-2185).
+ extension = extension.toLowerCase(Locale.getDefault());
+ if (extension.equals("3ga")) {
+ return "audio/3gpp";
+ }
+ return MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension);
+ }
+
+ /**
+ * Returns the mime type of the data specified by the given URI string.
+ *
+ * @param uriString the URI string of the data
+ * @return the mime type of the specified data
+ */
+ public static String getMimeType(String uriString, CordovaInterface cordova) {
+ String mimeType = null;
+
+ Uri uri = Uri.parse(uriString);
+ if (uriString.startsWith("content://")) {
+ mimeType = cordova.getActivity().getContentResolver().getType(uri);
+ } else {
+ mimeType = getMimeTypeForExtension(uri.getPath());
+ }
+
+ return mimeType;
+ }
+}
[16/20] git commit: Merge branch 'dev' of
https://git-wip-us.apache.org/repos/asf/cordova-plugin-camera into dev
Posted by st...@apache.org.
Merge branch 'dev' of https://git-wip-us.apache.org/repos/asf/cordova-plugin-camera into dev
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/commit/6a9949bb
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/tree/6a9949bb
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/diff/6a9949bb
Branch: refs/heads/master
Commit: 6a9949bb8c883b0d4c9866ef2846d6c70f8e0f3a
Parents: f5a521f 363d139
Author: Anis Kadri <an...@apache.org>
Authored: Wed Sep 25 15:03:03 2013 +0200
Committer: Anis Kadri <an...@apache.org>
Committed: Wed Sep 25 15:03:03 2013 +0200
----------------------------------------------------------------------
----------------------------------------------------------------------
[08/20] git commit: Fix compiler warnings
Posted by st...@apache.org.
Fix compiler warnings
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/commit/224e7cfb
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/tree/224e7cfb
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/diff/224e7cfb
Branch: refs/heads/master
Commit: 224e7cfb2006a5d7ef8e7083b6913715312b23f4
Parents: bc32c50
Author: Andrew Grieve <ag...@chromium.org>
Authored: Mon Sep 9 16:21:30 2013 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Mon Sep 9 16:21:30 2013 -0400
----------------------------------------------------------------------
src/android/FileHelper.java | 4 ----
1 file changed, 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/224e7cfb/src/android/FileHelper.java
----------------------------------------------------------------------
diff --git a/src/android/FileHelper.java b/src/android/FileHelper.java
index fb7fc6f..24ced59 100644
--- a/src/android/FileHelper.java
+++ b/src/android/FileHelper.java
@@ -26,12 +26,8 @@ import org.apache.cordova.CordovaInterface;
import org.apache.cordova.LOG;
import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.io.OutputStream;
-import java.nio.charset.Charset;
import java.util.Locale;
public class FileHelper {
[04/20] git commit: [CB-4752] Incremented plugin version on dev
branch.
Posted by st...@apache.org.
[CB-4752] Incremented plugin version on dev branch.
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/commit/8c77ddb8
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/tree/8c77ddb8
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/diff/8c77ddb8
Branch: refs/heads/master
Commit: 8c77ddb86424e128e463b690e2dd10974a8a852e
Parents: a9546c4
Author: Andrew Grieve <ag...@chromium.org>
Authored: Fri Sep 6 00:58:21 2013 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Fri Sep 6 00:58:21 2013 -0400
----------------------------------------------------------------------
plugin.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/8c77ddb8/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index 18d08e9..dcc7910 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -3,7 +3,7 @@
<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
xmlns:android="http://schemas.android.com/apk/res/android"
id="org.apache.cordova.core.camera"
- version="0.2.1">
+ version="0.2.2-dev">
<name>Camera</name>
<description>Cordova Camera Plugin</description>
<license>Apache 2.0</license>
[17/20] git commit: CB-4889 renaming core inside cameraProxy
Posted by st...@apache.org.
CB-4889 renaming core inside cameraProxy
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/commit/6a1a558e
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/tree/6a1a558e
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/diff/6a1a558e
Branch: refs/heads/master
Commit: 6a1a558e811a355ad9a6ecd50cfe799274c6419e
Parents: 6a9949b
Author: Anis Kadri <an...@apache.org>
Authored: Wed Sep 25 15:34:11 2013 +0200
Committer: Anis Kadri <an...@apache.org>
Committed: Wed Sep 25 15:34:11 2013 +0200
----------------------------------------------------------------------
src/windows8/CameraProxy.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/6a1a558e/src/windows8/CameraProxy.js
----------------------------------------------------------------------
diff --git a/src/windows8/CameraProxy.js b/src/windows8/CameraProxy.js
index 16e20f6..b63efb3 100644
--- a/src/windows8/CameraProxy.js
+++ b/src/windows8/CameraProxy.js
@@ -24,9 +24,9 @@
var cordova = require('cordova'),
Camera = require('./Camera'),
- FileEntry = require('org.apache.cordova.core.file.FileEntry'),
- FileError = require('org.apache.cordova.core.file.FileError'),
- FileReader = require('org.apache.cordova.core.file.FileReader');
+ FileEntry = require('org.apache.cordova.file.FileEntry'),
+ FileError = require('org.apache.cordova.file.FileError'),
+ FileReader = require('org.apache.cordova.file.FileReader');
module.exports = {