--- android/EKLLauncher/src/dk/thoerup/ekllauncher/EKLLauncherActivity.java	2013/02/25 10:16:25	1926
+++ android/EKLLauncher/src/dk/thoerup/ekllauncher/EKLLauncherActivity.java	2013/02/25 13:03:28	1927
@@ -77,30 +77,37 @@
 			String msg = message.trim().toLowerCase();
 
 			if (msg.equals("ekl identifikation mangler")) {
-				result.confirm(device);
+				if (device != null && device.equals("")==false) {
+					result.confirm(device);
 
-				timeoutHandler.sendEmptyMessageDelayed(1, 500); //efter pdaID er sendt til app'en skal vi genindlæse siden for at tvinge den til at hente data
-				return true;
-			} else if (msg.startsWith("indtast retur antal")) {
-
-				AlertDialog.Builder alert = new AlertDialog.Builder(EKLLauncherActivity.this);
-
-				//alert.setTitle("Title");
-				alert.setMessage(message);
-
-				// Set an EditText view to get user input 
-				final EditText input = new EditText(EKLLauncherActivity.this);
-				input.setInputType(InputType.TYPE_CLASS_NUMBER);
-				alert.setView(input);
-
-				alert.setPositiveButton("Ok", new DialogInterface.OnClickListener() {
-					public void onClick(DialogInterface dialog, int whichButton) {
-						result.confirm(input.getText().toString());
-					}
-				});
-				alert.show();
-
-				return true;				
+					timeoutHandler.sendEmptyMessageDelayed(1, 500); //efter pdaID er sendt til app'en skal vi genindlæse siden for at tvinge den til at hente data
+					return true;
+				} else {
+					//Hvis vi ikke kunne aflæse device, spørg user via en custom Input Dialog
+					//Dialogen kan kun tage imod tal &
+					//når at vi får en confirm på den tvinger vi ud i en reload af siden
+					
+					AlertDialog.Builder alert = new AlertDialog.Builder(EKLLauncherActivity.this);
+
+					//alert.setTitle("Title");
+					alert.setMessage(message);
+
+					// Set an EditText view to get user input 
+					final EditText input = new EditText(EKLLauncherActivity.this);
+					input.setInputType(InputType.TYPE_CLASS_NUMBER);
+					alert.setView(input);
+
+					alert.setPositiveButton("Ok", new DialogInterface.OnClickListener() {
+						public void onClick(DialogInterface dialog, int whichButton) {
+							result.confirm(input.getText().toString());
+							timeoutHandler.sendEmptyMessageDelayed(1, 500);
+						}
+					});
+					alert.show();
+
+					return true;		
+					
+				}		
 			} else {
 				return super.onJsPrompt(view, url, message, defaultValue, result);
 			}									
@@ -111,7 +118,7 @@
 	}
 	
 	static final String LOGTAG = "EklLauncher";
-	static final String URL = "http://omdeling.info/mobil_gpstrack/ekl/login.php";
+	static final String URL = "http://omdeling.info/mobil_gpstrack/ekl/";
 	
 	LocationManager locMgr;
 	ConnectivityManager connMgr;
@@ -157,6 +164,8 @@
         
         
         
+        //
+        
         device = telMgr.getLine1Number();
         if (device == null || device.equals("")) {
         	device = telMgr.getSimSerialNumber();
@@ -164,10 +173,14 @@
         	if(device == null)
         		device = "";        	        	
         }
+        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);
@@ -193,6 +206,8 @@
         
         web.setWebChromeClient(new CustomChromeClient() );
         web.setWebViewClient( new DummyWebViewClient() ); // skal have en webviewclient for at kunne styre ved forlad tur
+                
+        
 
         //Hvis at tlf rebooter mit i et område uden dækning er det ikke smart at vi skal vente på data
         //simHandler.sendEmptyMessage(0);
@@ -253,8 +268,11 @@
 			web.reload();
 			break;
 		case 2:
-			WebStorage.getInstance().deleteAllData();
 			web.clearCache(true);
+			
+			WebStorage.getInstance().deleteAllData();			
+			WebStorage.getInstance().deleteOrigin(URL);
+			
 			web.reload();
 			break;
 		}