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

diff --git a/src/org/average/whereami/WhereAmI.java b/src/org/average/whereami/WhereAmI.java
index 9731e09..94aba8f 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;
@@ -23,6 +27,7 @@ import android.preference.PreferenceManager;
 import android.text.format.Time;
 import android.util.Log;
 import android.view.View;
+import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@@ -40,6 +45,9 @@ public class WhereAmI extends Activity
     private Integer runningtasks = 0;
     private SharedPreferences prefs;
     private PersistentStore store;
+    private Random random = new Random();
+    private Boolean revive = false;
+    private Context context;
 
     private class UpdateTarget {
         private TextView tv;
@@ -50,7 +58,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();
+                for (int i = 2; !result.success && i <= 3; i++) {
+                    SystemClock.sleep(1000 + random.nextInt(1000));
+                    result = updater.getResult();
+                }
+                if (!result.success) {
+                    Log.e(TAG, "After third attempt still " +
+				result.message);
+                }
+                return result.message;
             }
         
             @Override
@@ -101,6 +118,20 @@ public class WhereAmI extends Activity
 
     private Handler mHandler = new Handler();
 
+    private Runnable reviveSelf = new Runnable() {
+        public void run() {
+            Log.v(TAG, "trying to revive self");
+            Intent intent = new Intent(Intent.ACTION_MAIN);
+            intent.addCategory(Intent.CATEGORY_LAUNCHER );
+            intent.setClass(context, WhereAmI.class);
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            intent.addFlags(Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED);
+            intent.addFlags(Intent.FLAG_FROM_BACKGROUND);
+            intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+            startActivity(intent);
+        }
+    };
+
     private Runnable updateClock = new Runnable () {
         public void run() {
             long now = System.currentTimeMillis();
@@ -201,6 +232,7 @@ public class WhereAmI extends Activity
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        context = this;
         if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.FROYO) {
             Log.v(TAG, "Disabling keepalive for build version " +
                        Build.VERSION.SDK_INT);
@@ -221,11 +253,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))
         };
     }
 
@@ -246,6 +279,7 @@ public class WhereAmI extends Activity
         } else {
             getWindow().clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
         }
+        revive = true;
 	mHandler.post(updateClock);
 	mHandler.post(updateCal);
 	mHandler.post(updateInfo);
@@ -261,6 +295,10 @@ public class WhereAmI extends Activity
 	mHandler.removeCallbacks(updateClock);
 	mHandler.removeCallbacks(updateCal);
 	mHandler.removeCallbacks(updateInfo);
+        if (revive) {
+            Log.v(TAG, "scheduling revival");
+	    mHandler.postDelayed(reviveSelf, 6000); // 6 second delay
+        }
     }
 
     /** Called when the activity is destroyed. */
@@ -283,6 +321,7 @@ public class WhereAmI extends Activity
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
         case R.id.quit:
+            revive = false;
             finish();
             return true;
         case R.id.authorize:
@@ -297,4 +336,13 @@ public class WhereAmI extends Activity
             return super.onOptionsItemSelected(item);
         }
     }
+
+    /** Override "back" button. Can still quit via menu. */
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        if (keyCode == KeyEvent.KEYCODE_BACK) {
+            return true;
+        }
+	return super.onKeyDown(keyCode, event);
+    }
 }