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 CredentialStore store;
private class UpdateTarget {
private TextView tv;
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.w(TAG, "disabling wifi result " + wifion);
+ }
Time tm = new Time();
tm.setToNow();
tvs.setText(R.string.lasttry);
ut[i].launch();
}
}
- mHandler.postDelayed(resetInfo, updatedelay);
- mHandler.postDelayed(this, 60000);
+ mHandler.postDelayed(resetInfo, 50000);
+ mHandler.postDelayed(this, updatedelay);
}
};
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+ prefs = PreferenceManager.getDefaultSharedPreferences(this);
+ store = new CredentialStore(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");
mHandler.post(updateClock);
@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 +
+ ", managewifi: " + managewifi +
+ ", updatedelay: " + updatedelay);
if (fullscreen) {
getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
getWindow().clearFlags(WindowManager.LayoutParams.
unregisterReceiver(connChanged);
connChangedRegistered = false;
}
- boolean wifion = wifiman.setWifiEnabled(false);
- Log.w(TAG, "disabling wifi result " + wifion);
+ if (managewifi) {
+ boolean wifion = wifiman.setWifiEnabled(false);
+ Log.w(TAG, "disabling wifi result " + wifion);
+ }
}
/** Called when the menu is activated. */