cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a...@apache.org
Subject [2/2] git commit: Merge branch 'tizen' of http://github.com/siovene/cordova-plugin-network-information into dev
Date Tue, 28 Jan 2014 06:57:33 GMT
Merge branch 'tizen' of http://github.com/siovene/cordova-plugin-network-information into dev


Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-network-information/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-network-information/commit/41642e74
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-network-information/tree/41642e74
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-network-information/diff/41642e74

Branch: refs/heads/dev
Commit: 41642e745dec1503dacaa431b5af9d4664b84842
Parents: 65e423c a78e4c5
Author: Anis Kadri <anis@apache.org>
Authored: Mon Jan 27 22:57:16 2014 -0800
Committer: Anis Kadri <anis@apache.org>
Committed: Mon Jan 27 22:57:16 2014 -0800

----------------------------------------------------------------------
 plugin.xml                | 28 ++++++++++-------
 src/tizen/NetworkProxy.js | 71 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 88 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-network-information/blob/41642e74/plugin.xml
----------------------------------------------------------------------
diff --cc plugin.xml
index 2fd1f09,3e618a8..c097e7a
--- a/plugin.xml
+++ b/plugin.xml
@@@ -46,45 -46,17 +46,45 @@@ xmlns:android="http://schemas.android.c
          </config-file>
  
          <source-file src="src/android/NetworkManager.java" target-dir="src/org/apache/cordova/networkinformation"
/>
-         
+ 
      </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="/*">
 +            <feature name="Camera">
 +                <param policy_group="connectivity" policy_version="1" />
 +            </feature>
 +        </config-file>
 +        <header-file src="src/ubuntu/network_information.h" />
 +        <source-file src="src/ubuntu/network_information.cpp" />
 +    </platform>
 +
      <!-- ios -->
-     <platform name="ios">    
+     <platform name="ios">
          <config-file target="config.xml" parent="/*">
              <feature name="NetworkStatus">
-                 <param name="ios-package" value="CDVConnection" /> 
+                 <param name="ios-package" value="CDVConnection" />
              </feature>
          </config-file>
-         
+ 
          <header-file src="src/ios/CDVConnection.h" />
          <source-file src="src/ios/CDVConnection.m" />
          <header-file src="src/ios/CDVReachability.h" />


Mime
View raw message