corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1250387 - Kill GckoConnectivityReceiver.java and improve GeckoNetworkManager.java r=grisha

Browse Source
This commit is contained in:
Shatur
2016-04-19 06:31:17 +05:30
parent ebfcb22bfe
commit 723ff2e162
6 changed files with 116 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java
View File

@@ -122,7 +122,6 @@ public class GeckoApplication extends Application
}
});
}
GeckoConnectivityReceiver.getInstance().stop();
GeckoNetworkManager.getInstance().stop();
}
@@ -134,7 +133,6 @@ public class GeckoApplication extends Application
final Context applicationContext = getApplicationContext();
GeckoBatteryManager.getInstance().start(applicationContext);
GeckoConnectivityReceiver.getInstance().start(applicationContext);
GeckoNetworkManager.getInstance().start(applicationContext);
mInBackground = false;

89
mobile/android/base/java/org/mozilla/gecko/GeckoConnectivityReceiver.java
View File

@@ -1,89 +0,0 @@
/* -*- Mode: Java; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*-
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
package org.mozilla.gecko;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.net.ConnectivityManager;
import android.net.NetworkInfo;
import android.util.Log;
public class GeckoConnectivityReceiver extends BroadcastReceiver {
/*
* Keep the below constants in sync with
* http://mxr.mozilla.org/mozilla-central/source/netwerk/base/nsINetworkLinkService.idl
*/
private static final String LINK_DATA_UP = "up";
private static final String LINK_DATA_DOWN = "down";
private static final String LINK_DATA_CHANGED = "changed";
private static final String LINK_DATA_UNKNOWN = "unknown";
private static final String LOGTAG = "GeckoConnectivityReceiver";
private static final GeckoConnectivityReceiver sInstance = new GeckoConnectivityReceiver();
private final IntentFilter mFilter;
private Context mApplicationContext;
private boolean mIsEnabled;
public static GeckoConnectivityReceiver getInstance() {
return sInstance;
}
private GeckoConnectivityReceiver() {
mFilter = new IntentFilter();
mFilter.addAction(ConnectivityManager.CONNECTIVITY_ACTION);
}
public synchronized void start(Context context) {
if (mIsEnabled) {
Log.w(LOGTAG, "Already started!");
return;
}
mApplicationContext = context.getApplicationContext();
// registerReceiver will return null if registering fails.
if (mApplicationContext.registerReceiver(this, mFilter) == null) {
Log.e(LOGTAG, "Registering receiver failed");
} else {
mIsEnabled = true;
}
}
public synchronized void stop() {
if (!mIsEnabled) {
Log.w(LOGTAG, "Already stopped!");
return;
}
mApplicationContext.unregisterReceiver(this);
mApplicationContext = null;
mIsEnabled = false;
}
@Override
public void onReceive(Context context, Intent intent) {
ConnectivityManager cm = (ConnectivityManager)context.getSystemService(Context.CONNECTIVITY_SERVICE);
NetworkInfo info = cm.getActiveNetworkInfo();
final String status;
if (info == null) {
status = LINK_DATA_UNKNOWN;
} else if (!info.isConnected()) {
status = LINK_DATA_DOWN;
} else {
status = LINK_DATA_UP;
}
if (GeckoThread.isRunning()) {
GeckoAppShell.sendEventToGecko(GeckoEvent.createNetworkLinkChangeEvent(status));
GeckoAppShell.sendEventToGecko(GeckoEvent.createNetworkLinkChangeEvent(LINK_DATA_CHANGED));
}
}
}

3
mobile/android/base/java/org/mozilla/gecko/GeckoEvent.java
View File

@@ -485,11 +485,12 @@ public class GeckoEvent {
return event;
}
public static GeckoEvent createNetworkEvent(int connectionType, boolean isWifi, int DHCPGateway) {
public static GeckoEvent createNetworkEvent(int connectionType, boolean isWifi, int DHCPGateway, String status) {
GeckoEvent event = GeckoEvent.get(NativeGeckoEvent.NETWORK_CHANGED);
event.mConnectionType = connectionType;
event.mIsWifi = isWifi;
event.mDHCPGateway = DHCPGateway;
event.mCharacters = status;
return event;
}

126
mobile/android/base/java/org/mozilla/gecko/GeckoNetworkManager.java
View File

@@ -37,6 +37,22 @@ import android.util.Log;
*/
public class GeckoNetworkManager extends BroadcastReceiver implements NativeEventListener {
/*
* Keep the below constants in sync with
* http://mxr.mozilla.org/mozilla-central/source/netwerk/base/nsINetworkLinkService.idl
*/
private static final String LINK_DATA_UP = "up";
private static final String LINK_DATA_DOWN = "down";
private static final String LINK_DATA_CHANGED = "changed";
private static final String LINK_DATA_UNKNOWN = "unknown";
private static final String LINK_TYPE_UNKONWN = "unknown";
private static final String LINK_TYPE_ETHERNET = "ethernet";
private static final String LINK_TYPE_WIFI = "wifi";
private static final String LINK_TYPE_WIMAX = "wimax";
private static final String LINK_TYPE_2G = "2g";
private static final String LINK_TYPE_3G = "3g";
private static final String LINK_TYPE_4G = "4g";
private static final String LOGTAG = "GeckoNetworkManager";
private static GeckoNetworkManager sInstance;
@@ -107,6 +123,7 @@ public class GeckoNetworkManager extends BroadcastReceiver implements NativeEven
@Override
public void onReceive(Context aContext, Intent aIntent) {
updateConnectionType();
updateLinkStatus(aContext);
}
public void start(final Context context) {
@@ -255,7 +272,27 @@ public class GeckoNetworkManager extends BroadcastReceiver implements NativeEven
GeckoAppShell.sendEventToGecko(GeckoEvent.createNetworkEvent(
newConnectionType.value,
newConnectionType == ConnectionType.WIFI,
wifiDhcpGatewayAddress()));
wifiDhcpGatewayAddress(),
getConnectionSubType()));
}
public void updateLinkStatus(Context context) {
ConnectivityManager cm = (ConnectivityManager)context.getSystemService(Context.CONNECTIVITY_SERVICE);
NetworkInfo info = cm.getActiveNetworkInfo();
final String status;
if (info == null) {
status = LINK_DATA_UNKNOWN;
} else if (!info.isConnected()) {
status = LINK_DATA_DOWN;
} else {
status = LINK_DATA_UP;
}
if (GeckoThread.isRunning()) {
GeckoAppShell.sendEventToGecko(GeckoEvent.createNetworkLinkChangeEvent(status));
GeckoAppShell.sendEventToGecko(GeckoEvent.createNetworkLinkChangeEvent(LINK_DATA_CHANGED));
}
}
public double[] getCurrentInformation() {
@@ -285,40 +322,93 @@ public class GeckoNetworkManager extends BroadcastReceiver implements NativeEven
}
}
private ConnectionType getConnectionType() {
private NetworkInfo getConnectivityManager() {
final Context appContext = mApplicationContext;
if (null == appContext) {
return ConnectionType.NONE;
return null;
}
ConnectivityManager cm = (ConnectivityManager) appContext.getSystemService(Context.CONNECTIVITY_SERVICE);
if (cm == null) {
Log.e(LOGTAG, "Connectivity service does not exist");
return ConnectionType.NONE;
Log.e(LOGTAG, "Connectivity service does not exist");
return null;
}
NetworkInfo ni = null;
try {
ni = cm.getActiveNetworkInfo();
} catch (SecurityException se) { /* if we don't have the permission, fall through to null check */ }
} catch (SecurityException se) {} // if we don't have the permission, fall through to null check
return ni;
}
private ConnectionType getConnectionType() {
NetworkInfo ni = getConnectivityManager();
if (ni == null) {
return ConnectionType.NONE;
}
switch (ni.getType()) {
case ConnectivityManager.TYPE_BLUETOOTH:
return ConnectionType.BLUETOOTH;
case ConnectivityManager.TYPE_ETHERNET:
return ConnectionType.ETHERNET;
case ConnectivityManager.TYPE_MOBILE:
case ConnectivityManager.TYPE_WIMAX:
return ConnectionType.CELLULAR;
case ConnectivityManager.TYPE_WIFI:
return ConnectionType.WIFI;
default:
Log.w(LOGTAG, "Ignoring the current network type.");
return ConnectionType.OTHER;
case ConnectivityManager.TYPE_BLUETOOTH:
return ConnectionType.BLUETOOTH;
case ConnectivityManager.TYPE_ETHERNET:
return ConnectionType.ETHERNET;
case ConnectivityManager.TYPE_MOBILE:
case ConnectivityManager.TYPE_WIMAX:
return ConnectionType.CELLULAR;
case ConnectivityManager.TYPE_WIFI:
return ConnectionType.WIFI;
default:
Log.w(LOGTAG, "Ignoring the current network type.");
return ConnectionType.OTHER;
}
}
private String getConnectionSubType() {
NetworkInfo ni = getConnectivityManager();
if (ni == null) {
return LINK_TYPE_UNKONWN;
}
switch (ni.getType()) {
case ConnectivityManager.TYPE_ETHERNET:
return LINK_TYPE_ETHERNET;
case ConnectivityManager.TYPE_MOBILE:
switch (ni.getSubtype()) {
case TelephonyManager.NETWORK_TYPE_GPRS:
case TelephonyManager.NETWORK_TYPE_EDGE:
case TelephonyManager.NETWORK_TYPE_CDMA:
case TelephonyManager.NETWORK_TYPE_1xRTT:
case TelephonyManager.NETWORK_TYPE_IDEN:
return LINK_TYPE_2G;
case TelephonyManager.NETWORK_TYPE_UMTS:
case TelephonyManager.NETWORK_TYPE_EVDO_0:
case TelephonyManager.NETWORK_TYPE_EVDO_A:
case TelephonyManager.NETWORK_TYPE_HSDPA:
case TelephonyManager.NETWORK_TYPE_HSUPA:
case TelephonyManager.NETWORK_TYPE_HSPA:
case TelephonyManager.NETWORK_TYPE_EVDO_B:
case TelephonyManager.NETWORK_TYPE_EHRPD:
case TelephonyManager.NETWORK_TYPE_HSPAP:
return LINK_TYPE_3G;
case TelephonyManager.NETWORK_TYPE_LTE:
return LINK_TYPE_4G;
default:
return LINK_TYPE_2G;
/* We are not returning LINK_TYPE_UNKONOWN because we treat unknown
* as "no connection" in code elsewhere, which is not the case.
* TODO: Network change notification issue causes a caching problem (Bug 1236130).
*/
}
case ConnectivityManager.TYPE_WIMAX:
return LINK_TYPE_WIMAX;
case ConnectivityManager.TYPE_WIFI:
return LINK_TYPE_WIFI;
default:
return LINK_TYPE_UNKONWN;
}
}

1
mobile/android/base/moz.build
View File

@@ -314,7 +314,6 @@ gbjar.sources += ['java/org/mozilla/gecko/' + x for x in [
'GeckoApplication.java',
'GeckoAppShell.java',
'GeckoBatteryManager.java',
'GeckoConnectivityReceiver.java',
'GeckoEditable.java',
'GeckoEditableClient.java',
'GeckoEditableListener.java',

6
widget/android/nsAppShell.cpp
View File

@@ -832,6 +832,12 @@ nsAppShell::LegacyGeckoEvent::Run()
hal::NotifyNetworkChange(hal::NetworkInformation(curEvent->ConnectionType(),
curEvent->IsWifi(),
curEvent->DHCPGateway()));
nsCOMPtr<nsIObserverService> os = mozilla::services::GetObserverService();
if (os) {
os->NotifyObservers(nullptr,
NS_NETWORK_LINK_TYPE_TOPIC,
nsString(curEvent->Characters()).get());
}
break;
}