X-Git-Url: http://www.average.org/gitweb/?p=WhereAmI.git;a=blobdiff_plain;f=src%2Forg%2Faverage%2Fwhereami%2FWhereAmI.java;h=1d3c2686e26da6b773d8da8b0042efab0bbc6bd8;hp=e9c3c0349518c736b390abcf542cced79027b6f3;hb=ecc054fdc790ab6cd0ccf9693b192a7e1fd3252c;hpb=1f9175b218f70556730b7f27c87296647b2ec219

diff --git a/src/org/average/whereami/WhereAmI.java b/src/org/average/whereami/WhereAmI.java
index e9c3c03..1d3c268 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,13 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.Context;
 import android.content.res.Resources;
+import android.content.SharedPreferences;
 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;
@@ -24,6 +30,7 @@ public class WhereAmI extends Activity
 {
     private WifiManager wifiman;
     private Integer runningtasks = 0;
+    private SharedPreferences prefs;
 
     private class UpdateTarget {
         private TextView tv;
@@ -53,6 +60,12 @@ public class WhereAmI extends Activity
                     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) {
@@ -117,6 +130,7 @@ 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);
@@ -127,7 +141,10 @@ public class WhereAmI extends Activity
     private Runnable resetInfo = new Runnable () {
         public void run() {
             Log.w("WhereAmI", "resetInfo starting");
-            unregisterReceiver(connChanged);
+            if (connChangedRegistered) {
+                unregisterReceiver(connChanged);
+                connChangedRegistered = false;
+            }
             if (runningtasks > 0) {
                 for (int i = 0; i < ut.length; i++) {
                     ut[i].cancel();
@@ -142,6 +159,7 @@ public class WhereAmI extends Activity
         }
     };
 
+    private boolean connChangedRegistered = false;
     private final BroadcastReceiver connChanged = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
@@ -165,12 +183,16 @@ public class WhereAmI extends Activity
     public void onCreate(Bundle savedInstanceState)
     {
         super.onCreate(savedInstanceState);
+        prefs = getSharedPreferences("WhereAmI", MODE_PRIVATE);
         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);
+        boolean fullscreen = prefs.getBoolean("fullscreen", false);
+        if (fullscreen) {
+            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);
@@ -194,8 +216,7 @@ public class WhereAmI extends Activity
     public void onPause()
     {
         super.onPause();
-        Log.w("WhereAmI", "calling finish");
-        finish();
+        Log.w("WhereAmI", "going background");
     }
 
     /** Called when the activity is destroyed. */
@@ -207,8 +228,35 @@ public class WhereAmI extends Activity
 	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);
+        }
+    }
 }