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

diff --combined src/org/average/whereami/WhereAmI.java
index e042505ed83dc163767ae736659ed56f0a99dac2,9ee5fd14909d3dda81041c4c243babfb31e16da3..e78cb04a9da2319a368161b65b0fa27b3b931dac
--- 1/src/org/average/whereami/WhereAmI.java
--- 2/src/org/average/whereami/WhereAmI.java
+++ b/src/org/average/whereami/WhereAmI.java
@@@ -3,7 -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;
@@@ -38,7 -38,6 +38,7 @@@ public class WhereAmI extends Activit
      private Long updatedelay = 60000L;
      private Integer runningtasks = 0;
      private SharedPreferences prefs;
 +    private CredentialStore store;
  
      private class UpdateTarget {
          private TextView tv;
@@@ -58,8 -57,10 +58,10 @@@
                  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 -147,8 +148,8 @@@
                      ut[i].launch();
                  }
              }
-             mHandler.postDelayed(resetInfo, updatedelay);
-             mHandler.postDelayed(this, 60000);
+             mHandler.postDelayed(resetInfo, 50000);
+             mHandler.postDelayed(this, updatedelay);
          }
      };
  
@@@ -197,8 -198,6 +199,8 @@@
      @Override
      public void onCreate(Bundle savedInstanceState) {
          super.onCreate(savedInstanceState);
 +        prefs = PreferenceManager.getDefaultSharedPreferences(this);
 +        store = new CredentialStore(prefs);
          wifiman = (WifiManager)getSystemService(Context.WIFI_SERVICE);
          requestWindowFeature(Window.FEATURE_NO_TITLE);
          getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
@@@ -211,9 -210,9 +213,9 @@@
          tvs = (TextView)findViewById(R.id.timestamp);
        ut = new UpdateTarget[] {
              new UpdateTarget((TextView)findViewById(R.id.location),
 -                             new PhoneLog()),
 +                             new PhoneLog(store)),
              new UpdateTarget((TextView)findViewById(R.id.phonecall),
 -                             new Location())
 +                             new LastLocation(store))
          };
          Log.w(TAG, "created UI, about to start update task");
        mHandler.post(updateClock);
@@@ -226,9 -225,13 +228,12 @@@
      @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 +
+                           ", managewifi: " + managewifi +
+                           ", updatedelay: " + updatedelay);
          if (fullscreen) {
              getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
              getWindow().clearFlags(WindowManager.LayoutParams.
@@@ -257,8 -260,10 +262,10 @@@
              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. */