add PhoneLog class

[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 49abbe2919af7262b22fcabe30b5629f9bfc2b43..6f2550f1a344f552b0572757fc134ac38cc83b2e 100644 (file)
--- a/src/org/average/whereami/WhereAmI.java
+++ b/src/org/average/whereami/WhereAmI.java
@@ -1,6 +1,7 @@
 package org.average.whereami;
 
 import org.average.whereami.WhereAmIprefs;
+import org.average.whereami.PhoneLog;
 
 import android.app.Activity;
 import android.net.wifi.WifiManager;
@@ -30,6 +31,7 @@ import android.widget.TextView;
 public class WhereAmI extends Activity
 {
     private WifiManager wifiman;
+    private Boolean managewifi = false;
     private Long updatedelay = 60000L;
     private Integer runningtasks = 0;
     private SharedPreferences prefs;
@@ -44,8 +46,9 @@ public class WhereAmI extends Activity
             protected String doInBackground(Void... params) {
                 Log.w("WhereAmI", "BgUpdate " + updater + " starting");
                 SystemClock.sleep(5000); // real job do be done here
+                String result = PhoneLog.getResult();
                 Log.w("WhereAmI", "BgUpdate about to return");
-                return "5 seconds passed in " + updater;
+                return result;
             }
         
             @Override
@@ -129,12 +132,19 @@ public class WhereAmI extends Activity
     private Runnable updateInfo = new Runnable () {
         public void run() {
             Log.w("WhereAmI", "updateInfo starting");
-            IntentFilter intentFilter =
-                new IntentFilter("android.net.conn.CONNECTIVITY_CHANGE");
-            registerReceiver(connChanged,intentFilter);
-            connChangedRegistered = true;
-            boolean wifion = wifiman.setWifiEnabled(true);
-            Log.w("WhereAmI", "enabling wifi result " + wifion);
+            if (managewifi) {
+                IntentFilter intentFilter =
+                    new IntentFilter("android.net.conn.CONNECTIVITY_CHANGE");
+                registerReceiver(connChanged,intentFilter);
+                connChangedRegistered = true;
+                boolean wifion = wifiman.setWifiEnabled(true);
+                Log.w("WhereAmI", "enabling wifi result " + wifion);
+            } else {
+                for (int i = 0; i < ut.length; i++) {
+                    runningtasks++;
+                    ut[i].launch();
+                }
+            }
             mHandler.postDelayed(resetInfo, updatedelay);
             mHandler.postDelayed(this, 60000);
         }
@@ -156,8 +166,10 @@ public class WhereAmI extends Activity
                 tvs.setText(R.string.failtry);
                 tvs.append(tm.format(" %d/%m/%Y %H:%M:%S"));
             }
-            boolean wifion = wifiman.setWifiEnabled(false);
-            Log.w("WhereAmI", "disabling wifi result " + wifion);
+            if (managewifi) {
+                boolean wifion = wifiman.setWifiEnabled(false);
+                Log.w("WhereAmI", "disabling wifi result " + wifion);
+            }
         }
     };
 
@@ -211,6 +223,7 @@ public class WhereAmI extends Activity
         super.onResume();
         prefs = PreferenceManager.getDefaultSharedPreferences(this);
         boolean fullscreen = prefs.getBoolean("fullscreen", false);
+        managewifi = prefs.getBoolean("managewifi", false);
         updatedelay = Long.parseLong(prefs.getString("updateperiod", "1200000"));
         if (fullscreen) {
             getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);