added ubuntu support
diff --git a/CHANGELOG.md b/RELEASENOTES.md
similarity index 61%
rename from CHANGELOG.md
rename to RELEASENOTES.md
index 9603f65..a193150 100644
--- a/CHANGELOG.md
+++ b/RELEASENOTES.md
@@ -22,3 +22,16 @@
### 0.2.1 (Sept 5, 2013)
* CB-4432 copyright notice change
+
+### 0.2.3 (Sept 25, 2013)
+* CB-4889 bumping&resetting version
+* [windows8] commandProxy was moved
+* CB-4889 renaming org.apache.cordova.core.network-information to org.apache.cordova.network-information
+* removed duplicate comment line from plugin.xml
+* added Network APIs for FirefoxOS
+* Rename CHANGELOG.md -> RELEASENOTES.md
+* [CB-4752] Incremented plugin version on dev branch.
+
+ ### 0.2.4 (Oct 28, 2013)
+* CB-5128: add repo + issue tag to plugin.xml for network information plugin
+* [CB-4915] Incremented plugin version on dev branch.
diff --git a/plugin.xml b/plugin.xml
index d8a360c..c5a79f5 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -2,13 +2,15 @@
<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
xmlns:android="http://schemas.android.com/apk/res/android"
- id="org.apache.cordova.core.network-information"
- version="0.2.1">
+ id="org.apache.cordova.network-information"
+ version="0.2.5-dev">
<name>Network Information</name>
<description>Cordova Network Information Plugin</description>
<license>Apache 2.0</license>
<keywords>cordova,network,information</keywords>
+ <repo>https://git-wip-us.apache.org/repos/asf/cordova-plugin-network-information.git</repo>
+ <issue>https://issues.apache.org/jira/browse/CB/component/12320640</issue>
<js-module src="www/network.js" name="network">
<clobbers target="navigator.connection" />
@@ -22,10 +24,13 @@
<!-- firefoxos -->
<platform name="firefoxos">
<config-file target="config.xml" parent="/*">
- <param name="firefox-package" value="Network" />
- </config-file>
-
- <source-file src="src/firefoxos/network.js" target-dir="src/firefoxos" />
+ <feature name="Network">
+ <param name="firefoxos-package" value="Network" />
+ </feature>
+ </config-file>
+ <js-module src="src/firefoxos/NetworkProxy.js" name="NetworkProxy">
+ <runs />
+ </js-module>
</platform>
<!-- android -->
@@ -44,6 +49,23 @@
</platform>
+ <!-- amazon-fireos -->
+ <platform name="amazon-fireos">
+ <config-file target="res/xml/config.xml" parent="/*">
+ <feature name="NetworkStatus">
+ <param name="android-package" value="org.apache.cordova.networkinformation.NetworkManager"/>
+ </feature>
+ </config-file>
+
+ <config-file target="AndroidManifest.xml" parent="/*">
+ <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+ </config-file>
+
+ <source-file src="src/android/NetworkManager.java" target-dir="src/org/apache/cordova/networkinformation" />
+
+ </platform>
+
+
<!-- ubuntu -->
<platform name="ubuntu">
<config-file target="config.xml" parent="/*">
diff --git a/src/firefoxos/NetworkProxy.js b/src/firefoxos/NetworkProxy.js
new file mode 100644
index 0000000..831706b
--- /dev/null
+++ b/src/firefoxos/NetworkProxy.js
@@ -0,0 +1,60 @@
+/*
+ *
+ * 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.
+ *
+*/
+
+/*
+ Network API overview: http://dvcs.w3.org/hg/dap/raw-file/tip/network-api/Overview.html
+
+*/
+
+
+var cordova = require('cordova');
+
+module.exports = {
+
+ var connection = navigator.connection || navigator.mozConnection || navigator.webkitConnection;
+
+ getConnectionInfo: function (win, fail, args) {
+ /*
+ bandwidth of type double, readonly
+ The user agent must set the value of the bandwidth attribute to:
+ 0 if the user is currently offline;
+ Infinity if the bandwidth is unknown;
+ an estimation of the current bandwidth in MB/s (Megabytes per seconds) available for communication with the browsing context active document's domain.
+ */
+ win(connection.bandwidth);
+ },
+
+ isMetered: function (win, fail, args) {
+ /*
+ readonly attribute boolean metered
+ A connection is metered when the user's connection is subject to a limitation from his Internet Service Provider strong enough to request web applications to be careful with the bandwidth usage.
+
+ What is a metered connection is voluntarily left to the user agent to judge. It would not be possible to give an exhaustive list of limitations considered strong enough to flag the connection as metered and even if doable, some limitations can be considered strong or weak depending on the context.
+ Examples of metered connections are mobile connections with a small bandwidth quota or connections with a pay-per use plan.
+ The user agent MUST set the value of the metered attribute to true if the connection with the browsing context active document's domain is metered and false otherwise. If the implementation is not able to know the status of the connection or if the user is offline, the value MUST be set to false.
+
+ If unable to know if a connection is metered, a user agent could ask the user about the status of his current connection.
+ */
+ win(connection.metered);
+ }
+};
+
+require("cordova/firefoxos/commandProxy").add("Network", module.exports);
\ No newline at end of file
diff --git a/src/firefoxos/network.js b/src/firefoxos/network.js
deleted file mode 100644
index e4298a0..0000000
--- a/src/firefoxos/network.js
+++ /dev/null
@@ -1,29 +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.
- *
-*/
-
-var cordova = require('cordova');
-
-module.exports = {
- getConnectionInfo: function (win, fail, args) {
- var connection = navigator.connection || navigator.mozConnection || navigator.webkitConnection;
- win(connection.bandwidth);
- }
-};
\ No newline at end of file
diff --git a/src/windows8/NetworkInfoProxy.js b/src/windows8/NetworkInfoProxy.js
index 37cb5fe..a95e61b 100644
--- a/src/windows8/NetworkInfoProxy.js
+++ b/src/windows8/NetworkInfoProxy.js
@@ -84,4 +84,4 @@
};
-require("cordova/commandProxy").add("NetworkStatus",module.exports);
\ No newline at end of file
+require("cordova/windows8/commandProxy").add("NetworkStatus",module.exports);
diff --git a/test/cordova-incl.js b/test/cordova-incl.js
index dbcd1a6..bc1dd7a 100644
--- a/test/cordova-incl.js
+++ b/test/cordova-incl.js
@@ -20,7 +20,9 @@
*/
var PLAT;
-if (/Android/.exec(navigator.userAgent)) {
+if (/cordova-amazon-fireos/.exec(navigator.userAgent)) {
+ PLAT = 'amazon-fireos';
+}else if (/Android/.exec(navigator.userAgent)) {
PLAT = 'android';
} else if (/(iPad)|(iPhone)|(iPod)/.exec(navigator.userAgent)) {
PLAT = 'ios';
@@ -61,7 +63,7 @@
}
function backHome() {
- if (window.device && device.platform && device.platform.toLowerCase() == 'android') {
+ if (window.device && device.platform && (device.platform.toLowerCase() == 'android' || device.platform.toLowerCase() == 'amazon-fireos')) {
navigator.app.backHistory();
}
else {
