import org.average.whereami.WhereAmIprefs;
import org.average.whereami.Oracle;
import org.average.whereami.PhoneLog;
-import org.average.whereami.Location;
+import org.average.whereami.LastLocation;
import android.app.Activity;
import android.net.wifi.WifiManager;
private Long updatedelay = 60000L;
private Integer runningtasks = 0;
private SharedPreferences prefs;
+ private PersistentStore store;
private class UpdateTarget {
private TextView tv;
private class BgUpdate extends AsyncTask<Void, Void, String> {
@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--;
}
}
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++;
private Runnable resetInfo = new Runnable () {
public void run() {
- Log.w(TAG, "resetInfo starting");
+ Log.v(TAG, "resetInfo starting");
if (connChangedRegistered) {
unregisterReceiver(connChanged);
connChangedRegistered = false;
}
if (managewifi) {
boolean wifion = wifiman.setWifiEnabled(false);
- Log.w(TAG, "disabling wifi result " + wifion);
+ Log.v(TAG, "disabling wifi result " + wifion);
}
}
};
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++;
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+ prefs = PreferenceManager.getDefaultSharedPreferences(this);
+ store = new PersistentStore(prefs);
wifiman = (WifiManager)getSystemService(Context.WIFI_SERVICE);
requestWindowFeature(Window.FEATURE_NO_TITLE);
getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
tvs = (TextView)findViewById(R.id.timestamp);
ut = new UpdateTarget[] {
new UpdateTarget((TextView)findViewById(R.id.location),
- new PhoneLog()),
+ new PhoneLog(res, store)),
new UpdateTarget((TextView)findViewById(R.id.phonecall),
- new Location())
+ 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 */
@Override
public void onResume() {
super.onResume();
- prefs = PreferenceManager.getDefaultSharedPreferences(this);
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) {
@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);
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. */
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: