add Location class and parent

[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 6f2550f1a344f552b0572757fc134ac38cc83b2e..2539e0e38113a48a053e429a7e0e2cb0d07fe6c2 100644 (file)
--- a/src/org/average/whereami/WhereAmI.java
+++ b/src/org/average/whereami/WhereAmI.java
@@ -1,7 +1,9 @@
 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;
@@ -38,7 +40,7 @@ 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> {
@@ -46,7 +48,7 @@ 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
-                String result = PhoneLog.getResult();
+                String result = updater.getResult();
                 Log.w("WhereAmI", "BgUpdate about to return");
                 return result;
             }
@@ -73,7 +75,7 @@ public class WhereAmI extends Activity
             }
         }
 
-        public UpdateTarget(TextView tv, Integer updater) {
+        public UpdateTarget(TextView tv, Oracle updater) {
             this.tv = tv;
             this.updater = updater;
         }
@@ -207,8 +209,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);