X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=android%2Fsrc%2Fcom%2Fgoogle%2Fzxing%2Fclient%2Fandroid%2Fwifi%2FWifiActivity.java;h=eca347f0cfd5d95885cf300c47472dae46c653f8;hb=6e75ec5ea702e4e783f0e3a7a4aad3213192f773;hp=f39b7321944585b54cb003a462401c71f6375afe;hpb=740a416a21701650a2953f27ab13ea55c585bf06;p=zxing.git

diff --git a/android/src/com/google/zxing/client/android/wifi/WifiActivity.java b/android/src/com/google/zxing/client/android/wifi/WifiActivity.java
index f39b7321..eca347f0 100644
--- a/android/src/com/google/zxing/client/android/wifi/WifiActivity.java
+++ b/android/src/com/google/zxing/client/android/wifi/WifiActivity.java
@@ -44,13 +44,9 @@ public class WifiActivity extends Activity  {
   private WifiReceiver wifiReceiver;
   private boolean receiverRegistered;
   private int networkId;
-  private static int errorCount;
+  private int errorCount;
   private IntentFilter mWifiStateFilter;
 
-  static {
-    errorCount = 0;
-  }
-
   public void gotError(){
     final int maxErrorCount = 3;
     errorCount++;
@@ -243,14 +239,18 @@ public class WifiActivity extends Activity  {
     changeNetwork(setting);
   }
 
-  public void pause() {
+  @Override
+  public void onPause() {
+    super.onPause();
     if (receiverRegistered) {
       unregisterReceiver(wifiReceiver);
       receiverRegistered = false;
     }
   }
 
-  public void resume() {
+  @Override
+  public void onResume() {
+    super.onResume();
     if (wifiReceiver != null && mWifiStateFilter != null && !receiverRegistered) {
       registerReceiver(wifiReceiver, mWifiStateFilter);
       receiverRegistered = true;
@@ -259,6 +259,7 @@ public class WifiActivity extends Activity  {
 
   @Override
   protected void onDestroy() {
+    super.onDestroy();
     if (wifiReceiver != null) {
       if (receiverRegistered) {
 	unregisterReceiver(wifiReceiver);