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

Bug 969637 - NullPointerException in org.mozilla.gecko.GeckoConnectivityReceiver.start. r=wesj

Browse Source
This commit is contained in:
Richard Newman
2014-02-27 12:32:34 -08:00
parent f7b59edd4c
commit dd3dd366fe
10 changed files with 87 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
mobile/android/base/GeckoNetworkManager.java
View File

@@ -103,13 +103,15 @@ public class GeckoNetworkManager extends BroadcastReceiver {
}
private Context mApplicationContext;
private NetworkType mNetworkType = NetworkType.NETWORK_NONE;
private IntentFilter mNetworkFilter = new IntentFilter();
private NetworkType mNetworkType = NetworkType.NETWORK_NONE;
private final IntentFilter mNetworkFilter = new IntentFilter();
// Whether the manager should be listening to Network Information changes.
private boolean mShouldBeListening = false;
// Whether the manager should notify Gecko that a change in Network
// Information happened.
private boolean mShouldNotify = false;
private boolean mShouldNotify = false;
public static GeckoNetworkManager getInstance() {
return sInstance;
@@ -120,13 +122,14 @@ public class GeckoNetworkManager extends BroadcastReceiver {
updateNetworkType();
}
public void init(Context context) {
mApplicationContext = context.getApplicationContext();
mNetworkFilter.addAction(ConnectivityManager.CONNECTIVITY_ACTION);
mNetworkType = getNetworkType();
}
public void start(final Context context) {
// Note that this initialization clause only runs once.
if (mApplicationContext == null) {
mApplicationContext = context.getApplicationContext();
mNetworkFilter.addAction(ConnectivityManager.CONNECTIVITY_ACTION);
mNetworkType = getNetworkType();
}
public void start() {
mShouldBeListening = true;
updateNetworkType();
@@ -143,7 +146,7 @@ public class GeckoNetworkManager extends BroadcastReceiver {
mShouldBeListening = false;
if (mShouldNotify) {
stopListening();
stopListening();
}
}