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

[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 641d73fd558f63c063bda05f0cef5711215ed753..591d831af1bcfe1747f02e4cad85467f84260b28 100644 (file)
--- a/src/org/average/whereami/WhereAmI.java
+++ b/src/org/average/whereami/WhereAmI.java
@@ -1,13 +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 @@ public class WhereAmI extends Activity
 
     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 @@ public class WhereAmI extends Activity
             }
         }
 
-        public UpdateTarget(TextView tv, Integer updater) {
+        public UpdateTarget(TextView tv, Oracle updater) {
             this.tv = tv;
             this.updater = updater;
         }
@@ -205,8 +205,10 @@ public class WhereAmI extends Activity
         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);