X-Git-Url: http://www.average.org/gitweb/?p=WhereAmI.git;a=blobdiff_plain;f=src%2Forg%2Faverage%2Fwhereami%2FWhereAmI.java;h=c08453a28057b4b665fc28df5863277451849347;hp=e042505ed83dc163767ae736659ed56f0a99dac2;hb=e7ecf60a526f2f410d586895429e208370517bc9;hpb=bfc8f9db47cf00565026d44bc27d84def51f4a94 diff --git a/src/org/average/whereami/WhereAmI.java b/src/org/average/whereami/WhereAmI.java index e042505..c08453a 100644 --- a/src/org/average/whereami/WhereAmI.java +++ b/src/org/average/whereami/WhereAmI.java @@ -7,6 +7,7 @@ import org.average.whereami.LastLocation; 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; @@ -38,7 +39,7 @@ public class WhereAmI extends Activity private Long updatedelay = 60000L; private Integer runningtasks = 0; private SharedPreferences prefs; - private CredentialStore store; + private PersistentStore store; private class UpdateTarget { private TextView tv; @@ -48,28 +49,30 @@ public class WhereAmI extends Activity private class BgUpdate extends AsyncTask { @Override protected String doInBackground(Void... params) { - Log.w(TAG, "BgUpdate " + updater + " starting"); + Log.v(TAG, "BgUpdate " + updater + " starting"); return updater.getResult(); } @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) { - boolean wifion = wifiman.setWifiEnabled(false); - Log.w(TAG, "disabling wifi result " + wifion); + if (managewifi) { + boolean wifion = wifiman.setWifiEnabled(false); + 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--; } } @@ -132,28 +135,28 @@ 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++; ut[i].launch(); } } - mHandler.postDelayed(resetInfo, updatedelay); - mHandler.postDelayed(this, 60000); + mHandler.postDelayed(resetInfo, 50000); + mHandler.postDelayed(this, updatedelay); } }; private Runnable resetInfo = new Runnable () { public void run() { - Log.w(TAG, "resetInfo starting"); + Log.v(TAG, "resetInfo starting"); if (connChangedRegistered) { unregisterReceiver(connChanged); connChangedRegistered = false; @@ -169,7 +172,7 @@ public class WhereAmI extends Activity } if (managewifi) { boolean wifion = wifiman.setWifiEnabled(false); - Log.w(TAG, "disabling wifi result " + wifion); + Log.v(TAG, "disabling wifi result " + wifion); } } }; @@ -183,7 +186,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++; @@ -197,8 +200,16 @@ public class WhereAmI extends Activity @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + 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,15 +222,15 @@ public class WhereAmI extends Activity tvs = (TextView)findViewById(R.id.timestamp); ut = new UpdateTarget[] { new UpdateTarget((TextView)findViewById(R.id.location), - new PhoneLog(store)), + new PhoneLog(res, store)), new UpdateTarget((TextView)findViewById(R.id.phonecall), - new LastLocation(store)) + new LastLocation(res, store)) }; - Log.w(TAG, "created UI, about to start update task"); + Log.v(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"); + Log.v(TAG, "created UI, update task created"); } /** Called when reactivated */ @@ -229,6 +240,9 @@ public class WhereAmI extends Activity boolean fullscreen = prefs.getBoolean("fullscreen", false); managewifi = prefs.getBoolean("managewifi", false); updatedelay = Long.parseLong(prefs.getString("updateperiod", "1200000")); + Log.v("WhereAmI", "fullscreen: " + fullscreen + + ", managewifi: " + managewifi + + ", updatedelay: " + updatedelay); if (fullscreen) { getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN); getWindow().clearFlags(WindowManager.LayoutParams. @@ -242,14 +256,14 @@ public class WhereAmI extends Activity @Override public void onPause() { super.onPause(); - Log.w(TAG, "going background"); + Log.v(TAG, "going background"); } /** Called when the activity is destroyed. */ @Override public void onDestroy() { super.onDestroy(); - Log.w(TAG, "going down"); + Log.v(TAG, "going down"); mHandler.removeCallbacks(updateClock); mHandler.removeCallbacks(updateCal); mHandler.removeCallbacks(updateInfo); @@ -257,8 +271,10 @@ public class WhereAmI extends Activity unregisterReceiver(connChanged); connChangedRegistered = false; } - boolean wifion = wifiman.setWifiEnabled(false); - Log.w(TAG, "disabling wifi result " + wifion); + if (managewifi) { + boolean wifion = wifiman.setWifiEnabled(false); + Log.v(TAG, "disabling wifi result " + wifion); + } } /** Called when the menu is activated. */ @@ -277,11 +293,11 @@ public class WhereAmI extends Activity 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: