X-Git-Url: http://www.average.org/gitweb/?p=WhereAmI.git;a=blobdiff_plain;f=src%2Forg%2Faverage%2Fwhereami%2FWhereAmI.java;h=49abbe2919af7262b22fcabe30b5629f9bfc2b43;hp=9d012c35997d4f4b11d625b678b0879ca3ce1e1a;hb=4e67198f228c17d21e071e7f89f67c42e213bc11;hpb=558910007298559dde1b3d3cae13cd6c6dd79f75 diff --git a/src/org/average/whereami/WhereAmI.java b/src/org/average/whereami/WhereAmI.java index 9d012c3..49abbe2 100644 --- a/src/org/average/whereami/WhereAmI.java +++ b/src/org/average/whereami/WhereAmI.java @@ -1,5 +1,7 @@ package org.average.whereami; +import org.average.whereami.WhereAmIprefs; + import android.app.Activity; import android.net.wifi.WifiManager; import android.os.Bundle; @@ -13,9 +15,14 @@ import android.content.Intent; import android.content.IntentFilter; import android.content.Context; import android.content.res.Resources; +import android.content.SharedPreferences; +import android.preference.PreferenceManager; import android.text.format.Time; import android.util.Log; import android.view.View; +import android.view.Menu; +import android.view.MenuInflater; +import android.view.MenuItem; import android.view.Window; import android.view.WindowManager; import android.widget.TextView; @@ -23,14 +30,59 @@ import android.widget.TextView; public class WhereAmI extends Activity { private WifiManager wifiman; + private Long updatedelay = 60000L; private Integer runningtasks = 0; + private SharedPreferences prefs; private class UpdateTarget { - public TextView tv; - public Integer updater; // will be the function/object + private TextView tv; + private Integer updater; // will be the function/object + private BgUpdate task; + + private class BgUpdate extends AsyncTask { + @Override + protected String doInBackground(Void... params) { + Log.w("WhereAmI", "BgUpdate " + updater + " starting"); + SystemClock.sleep(5000); // real job do be done here + Log.w("WhereAmI", "BgUpdate about to return"); + return "5 seconds passed in " + updater; + } + + @Override + protected void onPostExecute(String str) { + Log.w("WhereAmI", "BgUpdate callback executing"); + tv.setText(str); + runningtasks--; + if (runningtasks <= 0) { + boolean wifion = wifiman.setWifiEnabled(false); + Log.w("WhereAmI", "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")); + } + } + + @Override + protected void onCancelled() { + Log.w("WhereAmI", "BgUpdate callback cancelled"); + runningtasks--; + } + } + public UpdateTarget(TextView tv, Integer updater) { - this.tv = tv; - this.updater = updater; + this.tv = tv; + this.updater = updater; + } + + public void launch() { + tv.setText(R.string.updating); + task = new BgUpdate(); + task.execute(); + } + + public void cancel() { + task.cancel(true); } } private UpdateTarget[] ut; @@ -80,9 +132,10 @@ public class WhereAmI extends Activity IntentFilter intentFilter = new IntentFilter("android.net.conn.CONNECTIVITY_CHANGE"); registerReceiver(connChanged,intentFilter); + connChangedRegistered = true; boolean wifion = wifiman.setWifiEnabled(true); Log.w("WhereAmI", "enabling wifi result " + wifion); - mHandler.postDelayed(resetInfo, 30000); + mHandler.postDelayed(resetInfo, updatedelay); mHandler.postDelayed(this, 60000); } }; @@ -90,18 +143,25 @@ public class WhereAmI extends Activity private Runnable resetInfo = new Runnable () { public void run() { Log.w("WhereAmI", "resetInfo starting"); - unregisterReceiver(connChanged); - boolean wifion = wifiman.setWifiEnabled(false); - Log.w("WhereAmI", "disabling wifi result " + wifion); + if (connChangedRegistered) { + unregisterReceiver(connChanged); + connChangedRegistered = false; + } if (runningtasks > 0) { + for (int i = 0; i < ut.length; i++) { + ut[i].cancel(); + } Time tm = new Time(); tm.setToNow(); tvs.setText(R.string.failtry); tvs.append(tm.format(" %d/%m/%Y %H:%M:%S")); } + boolean wifion = wifiman.setWifiEnabled(false); + Log.w("WhereAmI", "disabling wifi result " + wifion); } }; + private boolean connChangedRegistered = false; private final BroadcastReceiver connChanged = new BroadcastReceiver() { @Override public void onReceive(Context context, Intent intent) { @@ -114,51 +174,19 @@ public class WhereAmI extends Activity if (isConnected) { for (int i = 0; i < ut.length; i++) { runningtasks++; - ut[i].tv.setText(R.string.updating); - new BgUpdate().execute(ut[i]); + ut[i].launch(); } } } }; - private class BgUpdate extends AsyncTask { - private UpdateTarget ut; - @Override - protected String doInBackground(UpdateTarget... whereto) { - Log.w("WhereAmI", "BgUpdate starting"); - ut = whereto[0]; - SystemClock.sleep(5000); // real job do be done here - Log.w("WhereAmI", "BgUpdate about to return"); - return "5 seconds passed"; - } - - @Override - protected void onPostExecute(String str) { - Log.w("WhereAmI", "BgUpdate callback executing"); - ut.tv.setText(str); - runningtasks--; - if (runningtasks <= 0) { - boolean wifion = wifiman.setWifiEnabled(false); - Log.w("WhereAmI", "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")); - } - } - } - /** Called when the activity is first created. */ @Override - public void onCreate(Bundle savedInstanceState) - { + public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); wifiman = (WifiManager)getSystemService(Context.WIFI_SERVICE); requestWindowFeature(Window.FEATURE_NO_TITLE); getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); - //getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN); - //getWindow().clearFlags(WindowManager.LayoutParams. - // FLAG_FORCE_NOT_FULLSCREEN); setContentView(R.layout.main); res = getResources(); month = res.getStringArray(R.array.month); @@ -177,26 +205,66 @@ public class WhereAmI extends Activity Log.w("WhereAmI", "created UI, update task created"); } + /** Called when reactivated */ + @Override + public void onResume() { + super.onResume(); + prefs = PreferenceManager.getDefaultSharedPreferences(this); + boolean fullscreen = prefs.getBoolean("fullscreen", false); + updatedelay = Long.parseLong(prefs.getString("updateperiod", "1200000")); + if (fullscreen) { + getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN); + getWindow().clearFlags(WindowManager.LayoutParams. + FLAG_FORCE_NOT_FULLSCREEN); + } else { + getWindow().clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN); + } + } + /** Called when put to background */ @Override - public void onPause() - { + public void onPause() { super.onPause(); - Log.w("WhereAmI", "calling finish"); - this.finish(); + Log.w("WhereAmI", "going background"); } /** Called when the activity is destroyed. */ @Override - public void onDestroy() - { + public void onDestroy() { super.onDestroy(); Log.w("WhereAmI", "going down"); mHandler.removeCallbacks(updateClock); mHandler.removeCallbacks(updateCal); mHandler.removeCallbacks(updateInfo); - //unregisterReceiver(connChanged); + if (connChangedRegistered) { + unregisterReceiver(connChanged); + connChangedRegistered = false; + } boolean wifion = wifiman.setWifiEnabled(false); Log.w("WhereAmI", "disabling wifi result " + wifion); } + + /** Called when the menu is activated. */ + @Override + public boolean onCreateOptionsMenu(Menu menu) { + MenuInflater inflater = getMenuInflater(); + inflater.inflate(R.menu.main_menu, menu); + return true; + } + + /** Called when the menu item is selected */ + @Override + public boolean onOptionsItemSelected(MenuItem item) { + switch (item.getItemId()) { + case R.id.quit: + finish(); + return true; + case R.id.settings: + Log.w("WhereAmI", "settings requested"); + startActivity(new Intent(this, WhereAmIprefs.class)); + return true; + default: + return super.onOptionsItemSelected(item); + } + } }