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

[WhereAmI.git] / src / org / average / whereami / WhereAmI.java

diff --git a/src/org/average/whereami/WhereAmI.java b/src/org/average/whereami/WhereAmI.java
index 2539e0e38113a48a053e429a7e0e2cb0d07fe6c2..591d831af1bcfe1747f02e4cad85467f84260b28 100644 (file)
--- a/src/org/average/whereami/WhereAmI.java
+++ b/src/org/average/whereami/WhereAmI.java
@@ -10,7 +10,6 @@ import android.net.wifi.WifiManager;
 import android.os.Bundle;
 import android.os.AsyncTask;
 import android.os.Handler;
-import android.os.SystemClock;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.content.BroadcastReceiver;
@@ -47,10 +46,7 @@ public class WhereAmI extends Activity
             @Override
             protected String doInBackground(Void... params) {
                 Log.w("WhereAmI", "BgUpdate " + updater + " starting");
-                SystemClock.sleep(5000); // real job do be done here
-                String result = updater.getResult();
-                Log.w("WhereAmI", "BgUpdate about to return");
-                return result;
+                return updater.getResult();
             }
         
             @Override
@@ -147,8 +143,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 +225,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.