javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-16 11:42:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3105 from NativeScript/connectivity

Browse Source 
Fix: connectivity module always returns undefined on android <= 4.4
This commit is contained in:
Rossen Hristov
2016-11-17 09:14:43 +02:00
committed by GitHub
parent c6cfdda43c 4fff9cd879
commit 1691e0edd3
1 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
tns-core-modules/connectivity/connectivity.android.ts
View File

@ -4,8 +4,8 @@ import utils = require("utils/utils");
global.moduleMerge(common, exports);
var WIFI = "WIFI";
var MOBILE = "MOBILE";
let wifi = "wifi";
let mobile = "mobile";
// Get Connection Type
function getConnectivityManager(): android.net.ConnectivityManager {
@ -13,7 +13,7 @@ function getConnectivityManager(): android.net.ConnectivityManager {
}
function getActiveNetworkInfo(): android.net.NetworkInfo {
var connectivityManager = getConnectivityManager();
let connectivityManager = getConnectivityManager();
if (!connectivityManager) {
return null;
}
@ -22,23 +22,26 @@ function getActiveNetworkInfo(): android.net.NetworkInfo {
}
export function getConnectionType(): number {
var activeNetworkInfo = getActiveNetworkInfo();
let activeNetworkInfo = getActiveNetworkInfo();
if (!activeNetworkInfo || !activeNetworkInfo.isConnected()) {
return common.connectionType.none;
}
var connectionType = activeNetworkInfo.getTypeName();
switch (connectionType) {
case WIFI:
return common.connectionType.wifi;
case MOBILE:
return common.connectionType.mobile;
let connectionType = activeNetworkInfo.getTypeName().toLowerCase();
if (connectionType.indexOf(wifi) !== -1){
return common.connectionType.wifi;
}
if (connectionType.indexOf(mobile) !== -1){
return common.connectionType.mobile;
}
return common.connectionType.none;
}
export function startMonitoring(connectionTypeChangedCallback: (newConnectionType: number) => void): void {
var onReceiveCallback = function onReceiveCallback(context: android.content.Context, intent: android.content.Intent) {
var newConnectionType = getConnectionType();
let onReceiveCallback = function onReceiveCallback(context: android.content.Context, intent: android.content.Intent) {
let newConnectionType = getConnectionType();
connectionTypeChangedCallback(newConnectionType);
}
appModule.android.registerBroadcastReceiver(android.net.ConnectivityManager.CONNECTIVITY_ACTION, onReceiveCallback);