diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 6d166d2..0a81aa7 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -46,3 +46,10 @@ ### 0.2.7 (Feb 05, 2014) * Initial implementation of Tizen plugin. + +### 0.2.8 (Apr 17, 2014) +* CB-6342: [iOS] iOS reports a cellular connection even when in Airplane mode +* CB-6422: [windows8] use cordova/exec/proxy +* CB-6460: Update license headers +* CB-6465: Add license headers to Tizen code +* Add NOTICE file diff --git a/plugin.xml b/plugin.xml index 1baf979..994cc94 100644 --- a/plugin.xml +++ b/plugin.xml @@ -1,9 +1,27 @@ + + version="0.2.9-dev"> Network Information Cordova Network Information Plugin diff --git a/src/ios/CDVConnection.m b/src/ios/CDVConnection.m index 3cfdc33..cbf4d69 100644 --- a/src/ios/CDVConnection.m +++ b/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"; diff --git a/src/ios/CDVReachability.m b/src/ios/CDVReachability.m index 89f4ec9..c60261a 100644 --- a/src/ios/CDVReachability.m +++ b/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 diff --git a/src/tizen/NetworkProxy.js b/src/tizen/NetworkProxy.js index 1b7a89a..cd9506e 100644 --- a/src/tizen/NetworkProxy.js +++ b/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'); diff --git a/src/windows8/NetworkInfoProxy.js b/src/windows8/NetworkInfoProxy.js index a95e61b..b987718 100644 --- a/src/windows8/NetworkInfoProxy.js +++ b/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);