X-Git-Url: http://www.average.org/gitweb/?p=WhereAmI.git;a=blobdiff_plain;f=src%2Forg%2Faverage%2Fwhereami%2FWhereAmI.java;h=e3f510ea4a6ff641d4823abb7e319327f970ea20;hp=9731e099c75d717d95e9d496f0114850b09b8e29;hb=6a4744c5765e743aa4057f5fcf5571e6ed8abafe;hpb=36b6777a469a0ab1a15016b2d34b9e2aa10a3c0a

diff --git a/src/org/average/whereami/WhereAmI.java b/src/org/average/whereami/WhereAmI.java
index 9731e09..e3f510e 100644
--- a/src/org/average/whereami/WhereAmI.java
+++ b/src/org/average/whereami/WhereAmI.java
@@ -1,16 +1,20 @@
 package org.average.whereami;
 
 import org.average.whereami.WhereAmIprefs;
+import org.average.whereami.APIBase;
 import org.average.whereami.Oracle;
 import org.average.whereami.PhoneLog;
 import org.average.whereami.LastLocation;
 
+import java.util.Random;
+
 import android.app.Activity;
 import android.net.wifi.WifiManager;
 import android.os.Build;
 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;
@@ -40,6 +44,7 @@ public class WhereAmI extends Activity
     private Integer runningtasks = 0;
     private SharedPreferences prefs;
     private PersistentStore store;
+    private Random random = new Random();
 
     private class UpdateTarget {
         private TextView tv;
@@ -50,7 +55,16 @@ public class WhereAmI extends Activity
             @Override
             protected String doInBackground(Void... params) {
                 Log.v(TAG, "BgUpdate " + updater + " starting");
-                return updater.getResult();
+		Utterance result = updater.getResult();
+                if (!result.success) {
+                    SystemClock.sleep(1000 + random.nextInt(1000));
+                    result = updater.getResult();
+                }
+                if (!result.success) {
+                    Log.e(TAG, "After second attempt still " +
+				result.message);
+                }
+                return result.message;
             }
         
             @Override
@@ -221,11 +235,12 @@ public class WhereAmI extends Activity
         tvt = (TextView)findViewById(R.id.time);
         tvd = (TextView)findViewById(R.id.date);
         tvs = (TextView)findViewById(R.id.timestamp);
+	APIBase base = new APIBase(res, store);
 	ut = new UpdateTarget[] {
             new UpdateTarget((TextView)findViewById(R.id.phonecall),
-                             new PhoneLog(res, store)),
+                             new PhoneLog(base)),
             new UpdateTarget((TextView)findViewById(R.id.location),
-                             new LastLocation(res, store))
+                             new LastLocation(base))
         };
     }