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 1d3c2686e26da6b773d8da8b0042efab0bbc6bd8..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;
 package org.average.whereami;
 
 import org.average.whereami.WhereAmIprefs;

+import org.average.whereami.PhoneLog;

 
 import android.app.Activity;
 import android.net.wifi.WifiManager;
 
 import android.app.Activity;
 import android.net.wifi.WifiManager;


@@ -16,6 +17,7 @@ import android.content.IntentFilter;
 import android.content.Context;
 import android.content.res.Resources;
 import android.content.SharedPreferences;
 import android.content.Context;
 import android.content.res.Resources;
 import android.content.SharedPreferences;

+import android.preference.PreferenceManager;

 import android.text.format.Time;
 import android.util.Log;
 import android.view.View;
 import android.text.format.Time;
 import android.util.Log;
 import android.view.View;


@@ -29,6 +31,8 @@ import android.widget.TextView;
 public class WhereAmI extends Activity
 {
     private WifiManager wifiman;
 public class WhereAmI extends Activity
 {
     private WifiManager wifiman;

+    private Boolean managewifi = false;
+    private Long updatedelay = 60000L;

     private Integer runningtasks = 0;
     private SharedPreferences prefs;
 
     private Integer runningtasks = 0;
     private SharedPreferences prefs;
 


@@ -42,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
             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");
                 Log.w("WhereAmI", "BgUpdate about to return");

-                return "5 seconds passed in " + updater;
+                return result;

             }
         
             @Override
             }
         
             @Override


@@ -127,13 +132,20 @@ public class WhereAmI extends Activity
     private Runnable updateInfo = new Runnable () {
         public void run() {
             Log.w("WhereAmI", "updateInfo starting");
     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);
-            mHandler.postDelayed(resetInfo, 30000);
+            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);
         }
     };
             mHandler.postDelayed(this, 60000);
         }
     };


@@ -154,8 +166,10 @@ public class WhereAmI extends Activity
                 tvs.setText(R.string.failtry);
                 tvs.append(tm.format(" %d/%m/%Y %H:%M:%S"));
             }
                 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);
+            }

         }
     };
 
         }
     };
 


@@ -180,19 +194,11 @@ public class WhereAmI extends Activity
 
     /** Called when the activity is first created. */
     @Override
 
     /** Called when the activity is first created. */
     @Override

-    public void onCreate(Bundle savedInstanceState)
-    {
+    public void onCreate(Bundle savedInstanceState) {

         super.onCreate(savedInstanceState);
         super.onCreate(savedInstanceState);

-        prefs = getSharedPreferences("WhereAmI", MODE_PRIVATE);

         wifiman = (WifiManager)getSystemService(Context.WIFI_SERVICE);
         requestWindowFeature(Window.FEATURE_NO_TITLE);
         getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
         wifiman = (WifiManager)getSystemService(Context.WIFI_SERVICE);
         requestWindowFeature(Window.FEATURE_NO_TITLE);
         getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);

-        boolean fullscreen = prefs.getBoolean("fullscreen", false);
-        if (fullscreen) {
-            getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
-            getWindow().clearFlags(WindowManager.LayoutParams.
-                                                  FLAG_FORCE_NOT_FULLSCREEN);
-        }

         setContentView(R.layout.main);
         res = getResources();
         month = res.getStringArray(R.array.month);
         setContentView(R.layout.main);
         res = getResources();
         month = res.getStringArray(R.array.month);


@@ -211,18 +217,33 @@ public class WhereAmI extends Activity
         Log.w("WhereAmI", "created UI, update task created");
     }
 
         Log.w("WhereAmI", "created UI, update task created");
     }
 

+    /** Called when reactivated */
+    @Override
+    public void onResume() {
+        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);
+            getWindow().clearFlags(WindowManager.LayoutParams.
+                                                  FLAG_FORCE_NOT_FULLSCREEN);
+        } else {
+            getWindow().clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
+        }
+    }
+

     /** Called when put to background */
     @Override
     /** Called when put to background */
     @Override

-    public void onPause()
-    {
+    public void onPause() {

         super.onPause();
         Log.w("WhereAmI", "going background");
     }
 
     /** Called when the activity is destroyed. */
     @Override
         super.onPause();
         Log.w("WhereAmI", "going background");
     }
 
     /** Called when the activity is destroyed. */
     @Override

-    public void onDestroy()
-    {
+    public void onDestroy() {

         super.onDestroy();
         Log.w("WhereAmI", "going down");
        mHandler.removeCallbacks(updateClock);
         super.onDestroy();
         Log.w("WhereAmI", "going down");
        mHandler.removeCallbacks(updateClock);