X-Git-Url: http://www.average.org/gitweb/?p=WhereAmI.git;a=blobdiff_plain;f=src%2Forg%2Faverage%2Fwhereami%2FWhereAmI.java;h=1002b3aadb0fc7d6d3aa7c5ca110b89cf7e7e90f;hp=d127fedc0a53351082dc0fe304954e3280d5742d;hb=816e15ad1c9de478be113a53a51b483791503c30;hpb=5a86e601c703aee386f13ea2cf9122fbde7cfcb0 diff --git a/src/org/average/whereami/WhereAmI.java b/src/org/average/whereami/WhereAmI.java index d127fed..1002b3a 100644 --- a/src/org/average/whereami/WhereAmI.java +++ b/src/org/average/whereami/WhereAmI.java @@ -48,19 +48,19 @@ 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) { 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(); @@ -71,7 +71,7 @@ public class WhereAmI extends Activity @Override protected void onCancelled() { - Log.w(TAG, "BgUpdate callback cancelled"); + Log.v(TAG, "BgUpdate callback cancelled"); runningtasks--; } } @@ -134,14 +134,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 +155,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; @@ -171,7 +171,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); } } }; @@ -185,7 +185,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++; @@ -217,11 +217,11 @@ public class WhereAmI extends Activity new UpdateTarget((TextView)findViewById(R.id.phonecall), 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 */ @@ -231,7 +231,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) { @@ -247,14 +247,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); @@ -264,7 +264,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); } } @@ -284,11 +284,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: