summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
740a416)
Make sure the ssid we are connected to is not null. This happens when
a network has been updated/removed while we are still connected to it.
Make errorCount an instance variable.
git-svn-id: http://zxing.googlecode.com/svn/trunk@1474
59b500cc-1b3d-0410-9834-
0bbf25fbcc57
private WifiReceiver wifiReceiver;
private boolean receiverRegistered;
private int networkId;
private WifiReceiver wifiReceiver;
private boolean receiverRegistered;
private int networkId;
- private static int errorCount;
+ private int errorCount;
private IntentFilter mWifiStateFilter;
private IntentFilter mWifiStateFilter;
- static {
- errorCount = 0;
- }
-
public void gotError(){
final int maxErrorCount = 3;
errorCount++;
public void gotError(){
final int maxErrorCount = 3;
errorCount++;
changeNetwork(setting);
}
changeNetwork(setting);
}
+ @Override
+ public void onPause() {
+ super.onPause();
if (receiverRegistered) {
unregisterReceiver(wifiReceiver);
receiverRegistered = false;
}
}
if (receiverRegistered) {
unregisterReceiver(wifiReceiver);
receiverRegistered = false;
}
}
+ @Override
+ public void onResume() {
+ super.onResume();
if (wifiReceiver != null && mWifiStateFilter != null && !receiverRegistered) {
registerReceiver(wifiReceiver, mWifiStateFilter);
receiverRegistered = true;
if (wifiReceiver != null && mWifiStateFilter != null && !receiverRegistered) {
registerReceiver(wifiReceiver, mWifiStateFilter);
receiverRegistered = true;
@Override
protected void onDestroy() {
@Override
protected void onDestroy() {
if (wifiReceiver != null) {
if (receiverRegistered) {
unregisterReceiver(wifiReceiver);
if (wifiReceiver != null) {
if (receiverRegistered) {
unregisterReceiver(wifiReceiver);
final NetworkInfo.State state = i.getState();
final String ssid = mWifiManager.getConnectionInfo().getSSID();
final NetworkInfo.State state = i.getState();
final String ssid = mWifiManager.getConnectionInfo().getSSID();
- if (state == NetworkInfo.State.CONNECTED){
+ if (state == NetworkInfo.State.CONNECTED && ssid != null){
mWifiManager.saveConfiguration();
final String label = parent.getString(R.string.wifi_connected);
statusView.setText(label + "\n" + ssid);
mWifiManager.saveConfiguration();
final String label = parent.getString(R.string.wifi_connected);
statusView.setText(label + "\n" + ssid);