--- android/EKLLauncher/src/dk/thoerup/ekllauncher/EKLLauncherActivity.java	2013/02/26 07:19:33	1930
+++ android/EKLLauncher/src/dk/thoerup/ekllauncher/EKLLauncherActivity.java	2013/02/26 10:22:43	1931
@@ -19,6 +19,7 @@
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.Window;
+import android.view.WindowManager;
 import android.webkit.GeolocationPermissions.Callback;
 import android.webkit.JsPromptResult;
 import android.webkit.WebChromeClient;
@@ -129,12 +130,18 @@
 	
 	SimHandler simHandler = new SimHandler();
 	
+	@Override
+	public void onAttachedToWindow() {
+	    this.getWindow().setType(WindowManager.LayoutParams.TYPE_KEYGUARD);
+	    super.onAttachedToWindow();
+	}
+	
     /** Called when the activity is first created. */
 	@Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         
-        Log.e(LOGTAG, "Starting");
+        Log.e(LOGTAG, "Creating");
         
         getWindow().requestFeature(Window.FEATURE_PROGRESS);
         
@@ -155,32 +162,24 @@
         locMgr = (LocationManager) this.getSystemService(Context.LOCATION_SERVICE);
         telMgr = (TelephonyManager) this.getSystemService(Context.TELEPHONY_SERVICE);
         connMgr = (ConnectivityManager) this.getSystemService(Context.CONNECTIVITY_SERVICE);        
-        
-        PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
-        wakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "EklLauncher");
-        wakeLock.acquire();        
-        
+                
         
         
-        //
         
         device = telMgr.getLine1Number();
-/*        if (device == null || device.equals("")) {
-        	device = telMgr.getSimSerialNumber();
-        	
-        	if(device == null)
-        		device = "";        	        	
-        }*/
-    	if(device == null)
-    		device = "";  
+    	if(device == null) {
+    		device = "";
+    	}
+    	if (device != null && device.equals("") == false){//Hvis vi kunne aflæse TLF nummer fra sim, så hvis den som en toast
+    		Toast.makeText(EKLLauncherActivity.this, "Device: "+device, Toast.LENGTH_SHORT).show();
+    	}
+    	
         Log.i(LOGTAG, "Device Line1: " + telMgr.getLine1Number());
         Log.i(LOGTAG, "Device simserial: " + telMgr.getSimSerialNumber());
         Log.i(LOGTAG, "Device subscriber: " + telMgr.getSubscriberId());
         Log.i(LOGTAG, "Device deviceid: " + telMgr.getDeviceId());//IMEI
         
-        
-        Toast.makeText(EKLLauncherActivity.this, "Device: "+device, Toast.LENGTH_SHORT).show();
-        
+                
         
         setContentView(R.layout.main);
         web = (WebView) findViewById(R.id.web);
@@ -230,6 +229,16 @@
         }
         
     }
+	
+	@Override
+	protected void onStart() {
+		super.onStart();
+		
+		Log.e(LOGTAG, "Starting");
+        PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
+        wakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "EklLauncher");
+        wakeLock.acquire();
+	}
     
     void showMessage(String msg) {
     	AlertDialog.Builder builder = new AlertDialog.Builder(this);
@@ -245,29 +254,45 @@
     }
 
 	@Override
-	protected void onDestroy() {
-		super.onDestroy();
-		wakeLock.release();
+	protected void onStop() {
+		
+        Log.e(LOGTAG, "Stopping");
+        
+		if (wakeLock != null && wakeLock.isHeld())
+			wakeLock.release();
+		
+		if (!web.getUrl().equals("about:blank"))
+			web.loadUrl("about:blank");
+		
+		super.onStop();
 	}
+	
+	static final int RELOAD = 1;
+	static final int FLUSH = 2;
+	static final int EXIT = 3;
 
 	@Override
 	public boolean onCreateOptionsMenu(Menu menu) {
 		MenuItem item;
-		item = menu.add(0, 1, 0, "Genindlæs side");
+		item = menu.add(0, RELOAD, 0, "Genindlæs side");
 		item.setIcon( R.drawable.ic_menu_refresh ); 
 		
-		item = menu.add(0, 2, 0, "Slet cache");
+		item = menu.add(0, FLUSH, 0, "Slet cache");
 		item.setIcon( R.drawable.ic_menu_delete );
+		
+		item = menu.add(0, EXIT, 0, "Forlad");
+		item.setIcon( android.R.drawable.ic_menu_close_clear_cancel);
+		
 		return super.onCreateOptionsMenu(menu);
 	}
 
 	@Override
 	public boolean onMenuItemSelected(int featureId, MenuItem item) {
 		switch (item.getItemId()) {
-		case 1:
+		case RELOAD:
 			web.reload();
 			break;
-		case 2:
+		case FLUSH:
 			web.clearCache(true);
 			
 			WebStorage.getInstance().deleteAllData();			
@@ -275,7 +300,11 @@
 			
 			web.reload();
 			break;
+		case EXIT:							
+			this.finish();
+			break;			
 		}
+		
 		return super.onMenuItemSelected(featureId, item);
 	}