bumping version

AndroidManifest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="rogatkin.mobile.web"
-      android:versionCode="10" android:versionName="@string/app_version">
+      android:versionCode="11" android:versionName="@string/app_version">
     <uses-sdk android:minSdkVersion="6" android:targetSdkVersion="19"/>
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>

res/values/strings.xml

@@ -7,7 +7,7 @@
     <string name="http_prfx">http://</string>
     <string name="deploy">Deploy</string>
     <string name="list_deployed">Deployed web apps</string>
-    <string name="app_version">1.07</string>
+    <string name="app_version">1.08</string>
     <string name="menu_app_redeploy">Redeploy</string>
     <string name="menu_app_remove">Remove</string>
     <string name="menu_app_stop">Stop</string>

src/rogatkin/mobile/web/TJWSServ.java

@@ -29,6 +29,7 @@
 import rogatkin.web.WebAppServlet;
 import Acme.Utils;
 import Acme.Serve.FileServlet;
+import android.annotation.SuppressLint;
 import android.app.Service;
 import android.content.Context;
 import android.content.Intent;
@@ -113,12 +114,8 @@ public String deployApp(String url) throws RemoteException {
 		}
 
 		public List<String> rescanApps() throws RemoteException {
-			try {
 			scanDeployments();
 			updateServletsList();
-			} catch(Exception e) {
-				srv.log(e, "");
-			}
 			return servletsList;
 		}
 
@@ -141,6 +138,7 @@ public List<String> redeployApp(String name) throws RemoteException {
 
 	@Override
 	public void onDestroy() {
+		//srv.log("Destroy commande received");
 		stopServ(); // just in case
 		srv.destroyAllServlets();
 		if (logStream != System.out && logStream != null)
@@ -149,6 +147,7 @@ public void onDestroy() {
 	}
 
 	private void stopServ() {
+		//srv.log(new Exception("stop"), "stop");
 		if (status != ST_STOP)
 			srv.notifyStop();
 	}
@@ -165,7 +164,7 @@ public void run() {
 						wifiLock = wifiManager.createWifiLock(SERVICE_NAME);
 					}
 					try {
-						// wifiLock.acquire();
+						wifiLock.acquire();
 						code = srv.serve();
 						if (Main.DEBUG) {
 							Log.d(SERVICE_NAME, "Serve terminated with :"
@@ -222,7 +221,7 @@ protected void initServ() {
 		resetServ();
 	}
 
-	protected void initLogging() {
+	@SuppressLint("NewApi") protected void initLogging() {
 		if (logStream != null)
 			return;
 		File logDir = new File(protectedFS ? getExternalCacheDir()
@@ -413,7 +412,7 @@ String updateNetworkSettings() {
 			srv.arguments
 					.put(Acme.Serve.SSLAcceptor.ARG_KEYSTOREPASS,
 							config.password == null
-									|| config.password.isEmpty() ? "changeme"
+									|| "".equals(config.password) ? "changeme"
 									: config.password);
 			srv.arguments.put(Acme.Serve.SSLAcceptor.ARG_KEYSTORETYPE, "BKS");
 			if (Main.DEBUG)