X-Git-Url: http://www.average.org/gitweb/?p=WhereAmI.git;a=blobdiff_plain;f=src%2Forg%2Faverage%2Fwhereami%2FWhereAmI.java;h=94aba8fe98e6ed7be488b7a219f20b00d30c85b1;hp=e78cb04a9da2319a368161b65b0fa27b3b931dac;hb=HEAD;hpb=4075fd74c86729ed0d774380f2c491a8e2a95c32 diff --git a/src/org/average/whereami/WhereAmI.java b/src/org/average/whereami/WhereAmI.java index e78cb04..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; @@ -38,7 +44,10 @@ public class WhereAmI extends Activity private Long updatedelay = 60000L; private Integer runningtasks = 0; private SharedPreferences prefs; - private CredentialStore store; + private PersistentStore store; + private Random random = new Random(); + private Boolean revive = false; + private Context context; private class UpdateTarget { private TextView tv; @@ -48,30 +57,39 @@ public class WhereAmI extends Activity private class BgUpdate extends AsyncTask { @Override protected String doInBackground(Void... params) { - Log.w(TAG, "BgUpdate " + updater + " starting"); - return updater.getResult(); + Log.v(TAG, "BgUpdate " + updater + " starting"); + 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 protected void onPostExecute(String str) { - Log.w(TAG, "BgUpdate callback executing"); + Log.v(TAG, "BgUpdate callback executing"); tv.setText(str); runningtasks--; if (runningtasks <= 0) { if (managewifi) { boolean wifion = wifiman.setWifiEnabled(false); - Log.w(TAG, "disabling wifi result " + wifion); + Log.v(TAG, "disabling wifi result " + wifion); } Time tm = new Time(); tm.setToNow(); tvs.setText(R.string.lasttry); - tvs.append(tm.format(" %d/%m/%Y %H:%M:%S")); + tvs.append(tm.format(" %d/%m/%Y %H:%M")); } } @Override protected void onCancelled() { - Log.w(TAG, "BgUpdate callback cancelled"); + Log.v(TAG, "BgUpdate callback cancelled"); runningtasks--; } } @@ -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(); @@ -134,14 +166,14 @@ public class WhereAmI extends Activity private Runnable updateInfo = new Runnable () { public void run() { - Log.w(TAG, "updateInfo starting"); + Log.v(TAG, "updateInfo starting"); if (managewifi) { IntentFilter intentFilter = new IntentFilter("android.net.conn.CONNECTIVITY_CHANGE"); registerReceiver(connChanged,intentFilter); connChangedRegistered = true; boolean wifion = wifiman.setWifiEnabled(true); - Log.w(TAG, "enabling wifi result " + wifion); + Log.v(TAG, "enabling wifi result " + wifion); } else { for (int i = 0; i < ut.length; i++) { runningtasks++; @@ -155,7 +187,7 @@ public class WhereAmI extends Activity private Runnable resetInfo = new Runnable () { public void run() { - Log.w(TAG, "resetInfo starting"); + Log.v(TAG, "resetInfo starting"); if (connChangedRegistered) { unregisterReceiver(connChanged); connChangedRegistered = false; @@ -164,14 +196,15 @@ 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); - Log.w(TAG, "disabling wifi result " + wifion); + Log.v(TAG, "disabling wifi result " + wifion); } } }; @@ -185,7 +218,7 @@ public class WhereAmI extends Activity NetworkInfo activeNetwork = cm.getActiveNetworkInfo(); boolean isConnected = activeNetwork != null && activeNetwork.isConnectedOrConnecting(); - Log.w(TAG, "Connectivity changed to " + isConnected); + Log.v(TAG, "Connectivity changed to " + isConnected); if (isConnected) { for (int i = 0; i < ut.length; i++) { runningtasks++; @@ -199,8 +232,17 @@ 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 CredentialStore(prefs); + store = new PersistentStore(prefs); wifiman = (WifiManager)getSystemService(Context.WIFI_SERVICE); requestWindowFeature(Window.FEATURE_NO_TITLE); getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); @@ -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(store)), new UpdateTarget((TextView)findViewById(R.id.phonecall), - new LastLocation(store)) + new PhoneLog(base)), + new UpdateTarget((TextView)findViewById(R.id.location), + new LastLocation(base)) }; - Log.w(TAG, "created UI, about to start update task"); - mHandler.post(updateClock); - mHandler.post(updateCal); - mHandler.post(updateInfo); - Log.w(TAG, "created UI, update task created"); } /** Called when reactivated */ @@ -231,7 +269,7 @@ public class WhereAmI extends Activity boolean fullscreen = prefs.getBoolean("fullscreen", false); managewifi = prefs.getBoolean("managewifi", false); updatedelay = Long.parseLong(prefs.getString("updateperiod", "1200000")); - Log.w("WhereAmI", "fullscreen: " + fullscreen + + Log.v("WhereAmI", "fullscreen: " + fullscreen + ", managewifi: " + managewifi + ", updatedelay: " + updatedelay); if (fullscreen) { @@ -241,31 +279,33 @@ 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 */ @Override public void onPause() { super.onPause(); - Log.w(TAG, "going background"); + 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. */ @Override public void onDestroy() { super.onDestroy(); - Log.w(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.w(TAG, "disabling wifi result " + wifion); - } + Log.v(TAG, "going down"); } /** Called when the menu is activated. */ @@ -281,18 +321,28 @@ 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: - Log.w(TAG, "authorize requested"); + Log.v(TAG, "authorize requested"); startActivity(new Intent(this, Authorize.class)); return true; case R.id.settings: - Log.w(TAG, "settings requested"); + Log.v(TAG, "settings requested"); startActivity(new Intent(this, WhereAmIprefs.class)); return true; default: 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); + } }