Merge branch 'master' of ssh://cahost.average.org/~/WhereAmI

diff --git a/src/org/average/whereami/WhereAmI.java b/src/org/average/whereami/WhereAmI.java
index e042505ed83dc163767ae736659ed56f0a99dac2..e78cb04a9da2319a368161b65b0fa27b3b931dac 100644 (file)
--- a/src/org/average/whereami/WhereAmI.java
+++ b/src/org/average/whereami/WhereAmI.java
@@ -58,8 +58,10 @@ public class WhereAmI extends Activity
                 tv.setText(str);
                 runningtasks--;
                 if (runningtasks <= 0) {
-                    boolean wifion = wifiman.setWifiEnabled(false);
-                    Log.w(TAG, "disabling wifi result " + wifion);
+                    if (managewifi) {
+                        boolean wifion = wifiman.setWifiEnabled(false);
+                        Log.w(TAG, "disabling wifi result " + wifion);
+                    }
                     Time tm = new Time();
                     tm.setToNow();
                     tvs.setText(R.string.lasttry);
@@ -146,8 +148,8 @@ public class WhereAmI extends Activity
                     ut[i].launch();
                 }
             }
-            mHandler.postDelayed(resetInfo, updatedelay);
-            mHandler.postDelayed(this, 60000);
+            mHandler.postDelayed(resetInfo, 50000);
+            mHandler.postDelayed(this, updatedelay);
         }
     };
 
@@ -229,6 +231,9 @@ public class WhereAmI extends Activity
         boolean fullscreen = prefs.getBoolean("fullscreen", false);
         managewifi = prefs.getBoolean("managewifi", false);
         updatedelay = Long.parseLong(prefs.getString("updateperiod", "1200000"));
+        Log.w("WhereAmI", "fullscreen: " + fullscreen +
+                          ", managewifi: " + managewifi +
+                          ", updatedelay: " + updatedelay);
         if (fullscreen) {
             getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
             getWindow().clearFlags(WindowManager.LayoutParams.
@@ -257,8 +262,10 @@ public class WhereAmI extends Activity
             unregisterReceiver(connChanged);
             connChangedRegistered = false;
         }
-        boolean wifion = wifiman.setWifiEnabled(false);
-        Log.w(TAG, "disabling wifi result " + wifion);
+        if (managewifi) {
+            boolean wifion = wifiman.setWifiEnabled(false);
+            Log.w(TAG, "disabling wifi result " + wifion);
+        }
     }
 
     /** Called when the menu is activated. */