Need to unregister for network intent receiver on shutdown to prevent leaks.

This commit is contained in:
Bryce Curtis 2011-05-31 15:13:54 -05:00
parent 10e1808c56
commit 39ec9c095d

View File

@ -59,11 +59,13 @@ public class NetworkManager extends Plugin {
ConnectivityManager sockMan;
TelephonyManager telephonyManager;
BroadcastReceiver receiver;
/**
* Constructor.
*/
public NetworkManager() {
this.receiver = null;
}
/**
@ -76,16 +78,21 @@ public class NetworkManager extends Plugin {
super.setContext(ctx);
this.sockMan = (ConnectivityManager) ctx.getSystemService(Context.CONNECTIVITY_SERVICE);
this.telephonyManager = ((TelephonyManager) ctx.getSystemService(Context.TELEPHONY_SERVICE));
this.connectionCallbackId = null;
// We need to listen to connectivity events to update navigator.connection
IntentFilter intentFilter = new IntentFilter() ;
intentFilter.addAction(ConnectivityManager.CONNECTIVITY_ACTION);
ctx.registerReceiver(new BroadcastReceiver() {
if (this.receiver == null) {
this.receiver = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
updateConnectionInfo((NetworkInfo) intent.getParcelableExtra(ConnectivityManager.EXTRA_NETWORK_INFO));
}
}, intentFilter);
};
ctx.registerReceiver(this.receiver, intentFilter);
}
}
/**
@ -136,6 +143,19 @@ public class NetworkManager extends Plugin {
return false;
}
/**
* Stop network receiver.
*/
public void onDestroy() {
if (this.receiver != null) {
try {
this.ctx.unregisterReceiver(this.receiver);
} catch (Exception e) {
System.out.println("Error unregistering network receiver: " + e.getMessage());
}
}
}
//--------------------------------------------------------------------------
// LOCAL METHODS
//--------------------------------------------------------------------------