From: Eugene Crosser <crosser@average.org>
Date: Tue, 31 Jan 2012 20:34:58 +0000 (+0400)
Subject: Merge branch 'master' of ssh://cahost.average.org/~/WhereAmI
X-Git-Url: http://www.average.org/gitweb/?p=WhereAmI.git;a=commitdiff_plain;h=5a1b41dd22020796d527c226012c5f37bfdc9a73;hp=-c

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

5a1b41dd22020796d527c226012c5f37bfdc9a73
diff --combined src/org/average/whereami/WhereAmI.java
index 641d73f,953fcc9..591d831
--- a/src/org/average/whereami/WhereAmI.java
+++ b/src/org/average/whereami/WhereAmI.java
@@@ -1,13 -1,15 +1,15 @@@
  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 android.app.Activity;
  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;
@@@ -37,16 -39,14 +39,14 @@@ public class WhereAmI extends Activit
  
      private class UpdateTarget {
          private TextView tv;
-         private Integer updater; // will be the function/object
+         private Oracle updater;
          private BgUpdate task;
  
          private class BgUpdate extends AsyncTask<Void, Void, String> {
              @Override
              protected String doInBackground(Void... params) {
                  Log.w("WhereAmI", "BgUpdate " + updater + " starting");
-                 SystemClock.sleep(5000); // real job do be done here
-                 Log.w("WhereAmI", "BgUpdate about to return");
-                 return "5 seconds passed in " + updater;
+                 return updater.getResult();
              }
          
              @Override
@@@ -71,7 -71,7 +71,7 @@@
              }
          }
  
-         public UpdateTarget(TextView tv, Integer updater) {
+         public UpdateTarget(TextView tv, Oracle updater) {
              this.tv = tv;
              this.updater = updater;
          }
@@@ -143,8 -143,8 +143,8 @@@
                      ut[i].launch();
                  }
              }
 -            mHandler.postDelayed(resetInfo, updatedelay);
 -            mHandler.postDelayed(this, 60000);
 +            mHandler.postDelayed(resetInfo, 50000);
 +            mHandler.postDelayed(this, updatedelay);
          }
      };
  
@@@ -205,8 -205,10 +205,10 @@@
          tvd = (TextView)findViewById(R.id.date);
          tvs = (TextView)findViewById(R.id.timestamp);
  	ut = new UpdateTarget[] {
-             new UpdateTarget((TextView)findViewById(R.id.location),  1),
-             new UpdateTarget((TextView)findViewById(R.id.phonecall), 2)
+             new UpdateTarget((TextView)findViewById(R.id.location),
+                              new PhoneLog()),
+             new UpdateTarget((TextView)findViewById(R.id.phonecall),
+                              new Location())
          };
          Log.w("WhereAmI", "created UI, about to start update task");
  	mHandler.post(updateClock);
@@@ -223,9 -225,6 +225,9 @@@
          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.