change Log verbosity

[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 591d831af1bcfe1747f02e4cad85467f84260b28..1002b3aadb0fc7d6d3aa7c5ca110b89cf7e7e90f 100644 (file)
--- a/src/org/average/whereami/WhereAmI.java
+++ b/src/org/average/whereami/WhereAmI.java
@@ -3,7 +3,7 @@ package org.average.whereami;
 import org.average.whereami.WhereAmIprefs;
 import org.average.whereami.Oracle;
 import org.average.whereami.PhoneLog;
-import org.average.whereami.Location;
+import org.average.whereami.LastLocation;
 
 import android.app.Activity;
 import android.net.wifi.WifiManager;
@@ -31,11 +31,14 @@ import android.widget.TextView;
 
 public class WhereAmI extends Activity
 {
+    final String TAG = getClass().getName();
+
     private WifiManager wifiman;
     private Boolean managewifi = false;
     private Long updatedelay = 60000L;
     private Integer runningtasks = 0;
     private SharedPreferences prefs;
+    private PersistentStore store;
 
     private class UpdateTarget {
         private TextView tv;
@@ -45,18 +48,20 @@ public class WhereAmI extends Activity
         private class BgUpdate extends AsyncTask<Void, Void, String> {
             @Override
             protected String doInBackground(Void... params) {
-                Log.w("WhereAmI", "BgUpdate " + updater + " starting");
+                Log.v(TAG, "BgUpdate " + updater + " starting");
                 return updater.getResult();
             }
         
             @Override
             protected void onPostExecute(String str) {
-                Log.w("WhereAmI", "BgUpdate callback executing");
+                Log.v(TAG, "BgUpdate callback executing");
                 tv.setText(str);
                 runningtasks--;
                 if (runningtasks <= 0) {
-                    boolean wifion = wifiman.setWifiEnabled(false);
-                    Log.w("WhereAmI", "disabling wifi result " + wifion);
+                    if (managewifi) {
+                        boolean wifion = wifiman.setWifiEnabled(false);
+                        Log.v(TAG, "disabling wifi result " + wifion);
+                    }
                     Time tm = new Time();
                     tm.setToNow();
                     tvs.setText(R.string.lasttry);
@@ -66,7 +71,7 @@ public class WhereAmI extends Activity
 
             @Override
             protected void onCancelled() {
-                Log.w("WhereAmI", "BgUpdate callback cancelled");
+                Log.v(TAG, "BgUpdate callback cancelled");
                 runningtasks--;
             }
         }
@@ -129,14 +134,14 @@ public class WhereAmI extends Activity
 
     private Runnable updateInfo = new Runnable () {
         public void run() {
-            Log.w("WhereAmI", "updateInfo starting");
+            Log.v(TAG, "updateInfo starting");
             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);
+                Log.v(TAG, "enabling wifi result " + wifion);
             } else {
                 for (int i = 0; i < ut.length; i++) {
                     runningtasks++;
@@ -150,7 +155,7 @@ public class WhereAmI extends Activity
 
     private Runnable resetInfo = new Runnable () {
         public void run() {
-            Log.w("WhereAmI", "resetInfo starting");
+            Log.v(TAG, "resetInfo starting");
             if (connChangedRegistered) {
                 unregisterReceiver(connChanged);
                 connChangedRegistered = false;
@@ -166,7 +171,7 @@ public class WhereAmI extends Activity
             }
             if (managewifi) {
                 boolean wifion = wifiman.setWifiEnabled(false);
-                Log.w("WhereAmI", "disabling wifi result " + wifion);
+                Log.v(TAG, "disabling wifi result " + wifion);
             }
         }
     };
@@ -180,7 +185,7 @@ public class WhereAmI extends Activity
             NetworkInfo activeNetwork = cm.getActiveNetworkInfo();
             boolean isConnected = activeNetwork != null &&
                                   activeNetwork.isConnectedOrConnecting();
-            Log.w("WhereAmI", "Connectivity changed to " + isConnected);
+            Log.v(TAG, "Connectivity changed to " + isConnected);
             if (isConnected) {
                 for (int i = 0; i < ut.length; i++) {
                     runningtasks++;
@@ -194,6 +199,8 @@ public class WhereAmI extends Activity
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        prefs = PreferenceManager.getDefaultSharedPreferences(this);
+        store = new PersistentStore(prefs);
         wifiman = (WifiManager)getSystemService(Context.WIFI_SERVICE);
         requestWindowFeature(Window.FEATURE_NO_TITLE);
         getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
@@ -206,26 +213,25 @@ public class WhereAmI extends Activity
         tvs = (TextView)findViewById(R.id.timestamp);
        ut = new UpdateTarget[] {
             new UpdateTarget((TextView)findViewById(R.id.location),
-                             new PhoneLog()),
+                             new PhoneLog(res, store)),
             new UpdateTarget((TextView)findViewById(R.id.phonecall),
-                             new Location())
+                             new LastLocation(res, store))
         };
-        Log.w("WhereAmI", "created UI, about to start update task");
+        Log.v(TAG, "created UI, about to start update task");
        mHandler.post(updateClock);
        mHandler.post(updateCal);
        mHandler.post(updateInfo);
-        Log.w("WhereAmI", "created UI, update task created");
+        Log.v(TAG, "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"));
-        Log.w("WhereAmI", "fullscreen: " + fullscreen +
+        Log.v("WhereAmI", "fullscreen: " + fullscreen +
                           ", managewifi: " + managewifi +
                           ", updatedelay: " + updatedelay);
         if (fullscreen) {
@@ -241,14 +247,14 @@ public class WhereAmI extends Activity
     @Override
     public void onPause() {
         super.onPause();
-        Log.w("WhereAmI", "going background");
+        Log.v(TAG, "going background");
     }
 
     /** Called when the activity is destroyed. */
     @Override
     public void onDestroy() {
         super.onDestroy();
-        Log.w("WhereAmI", "going down");
+        Log.v(TAG, "going down");
        mHandler.removeCallbacks(updateClock);
        mHandler.removeCallbacks(updateCal);
        mHandler.removeCallbacks(updateInfo);
@@ -256,8 +262,10 @@ public class WhereAmI extends Activity
             unregisterReceiver(connChanged);
             connChangedRegistered = false;
         }
-        boolean wifion = wifiman.setWifiEnabled(false);
-        Log.w("WhereAmI", "disabling wifi result " + wifion);
+        if (managewifi) {
+            boolean wifion = wifiman.setWifiEnabled(false);
+            Log.v(TAG, "disabling wifi result " + wifion);
+        }
     }
 
     /** Called when the menu is activated. */
@@ -275,8 +283,12 @@ public class WhereAmI extends Activity
         case R.id.quit:
             finish();
             return true;
+        case R.id.authorize:
+            Log.v(TAG, "authorize requested");
+            startActivity(new Intent(this, Authorize.class));
+            return true;
         case R.id.settings:
-            Log.w("WhereAmI", "settings requested");
+            Log.v(TAG, "settings requested");
             startActivity(new Intent(this, WhereAmIprefs.class));
             return true;
         default: