X-Git-Url: http://www.average.org/gitweb/?p=WhereAmI.git;a=blobdiff_plain;f=src%2Forg%2Faverage%2Fwhereami%2FWhereAmI.java;h=94aba8fe98e6ed7be488b7a219f20b00d30c85b1;hp=8a7da5929db3c068038ef629235edb7577882023;hb=HEAD;hpb=6f17d126fb3b2f1c9af57f64a95733e33c12bfd2 diff --git a/src/org/average/whereami/WhereAmI.java b/src/org/average/whereami/WhereAmI.java index 8a7da59..94aba8f 100644 --- a/src/org/average/whereami/WhereAmI.java +++ b/src/org/average/whereami/WhereAmI.java @@ -1,15 +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; @@ -22,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; @@ -39,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; @@ -49,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 @@ -100,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(); @@ -164,10 +196,11 @@ public class WhereAmI extends Activity for (int i = 0; i < ut.length; i++) { ut[i].cancel(); } + runningtasks = 0; Time tm = new Time(); tm.setToNow(); tvs.setText(R.string.failtry); - tvs.append(tm.format(" %d/%m/%Y %H:%M:%S")); + tvs.append(tm.format(" %d/%m/%Y %H:%M")); } if (managewifi) { boolean wifion = wifiman.setWifiEnabled(false); @@ -199,6 +232,15 @@ 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); + System.setProperty("http.keepAlive", "false"); + } else { + Log.v(TAG, "Post-Froyo version " + + Build.VERSION.SDK_INT); + } prefs = PreferenceManager.getDefaultSharedPreferences(this); store = new PersistentStore(prefs); wifiman = (WifiManager)getSystemService(Context.WIFI_SERVICE); @@ -211,17 +253,13 @@ 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.location), - new PhoneLog(res, store)), new UpdateTarget((TextView)findViewById(R.id.phonecall), - new LastLocation(res, store)) + new PhoneLog(base)), + new UpdateTarget((TextView)findViewById(R.id.location), + new LastLocation(base)) }; - Log.v(TAG, "created UI, about to start update task"); - mHandler.post(updateClock); - mHandler.post(updateCal); - mHandler.post(updateInfo); - Log.v(TAG, "created UI, update task created"); } /** Called when reactivated */ @@ -241,6 +279,11 @@ public class WhereAmI extends Activity } else { getWindow().clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN); } + revive = true; + mHandler.post(updateClock); + mHandler.post(updateCal); + mHandler.post(updateInfo); + Log.v(TAG, "update tasks scheduled"); } /** Called when put to background */ @@ -248,6 +291,14 @@ public class WhereAmI extends Activity public void onPause() { super.onPause(); Log.v(TAG, "going background"); + resetInfo.run(); + 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. */ @@ -255,17 +306,6 @@ public class WhereAmI extends Activity public void onDestroy() { super.onDestroy(); Log.v(TAG, "going down"); - mHandler.removeCallbacks(updateClock); - mHandler.removeCallbacks(updateCal); - mHandler.removeCallbacks(updateInfo); - if (connChangedRegistered) { - unregisterReceiver(connChanged); - connChangedRegistered = false; - } - if (managewifi) { - boolean wifion = wifiman.setWifiEnabled(false); - Log.v(TAG, "disabling wifi result " + wifion); - } } /** Called when the menu is activated. */ @@ -281,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: @@ -295,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); + } }