merged apache/dev

src/ios/CDVConnection.m

@@ -52,8 +52,14 @@
             return @"none";
 
         case ReachableViaWWAN:
-            return @"cellular";
-
+        {
+            BOOL isConnectionRequired = [reachability connectionRequired];
+            if (isConnectionRequired) {
+                return @"none";
+            } else {
+                return @"cellular";
+            }
+        }
         case ReachableViaWiFi:
             return @"wifi";
 

src/ios/CDVReachability.m

@@ -205,7 +205,7 @@ static void CDVReachabilityCallback(SCNetworkReachabilityRef target, SCNetworkRe
         return NotReachable;
     }
 
-    BOOL retVal = NotReachable;
+    NetworkStatus retVal = NotReachable;
 
     if ((flags & kSCNetworkReachabilityFlagsConnectionRequired) == 0) {
         // if target host is reachable and no connection is required

src/tizen/NetworkProxy.js

@@ -1,3 +1,24 @@
+/*
+ *
+ * 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');
 var Connection = require('./Connection');
 

src/windows8/NetworkInfoProxy.js

@@ -84,4 +84,4 @@ module.exports = {
 
 };
 
-require("cordova/windows8/commandProxy").add("NetworkStatus",module.exports);
+require("cordova/exec/proxy").add("NetworkStatus",module.exports);