build debian packages should work now

configure.ac

@@ -8,7 +8,7 @@
 
 m4_define(x_package_name, safechat) # project's name
 m4_define(x_major, 0) # project's major version
-m4_define(x_minor, 1) # project's minor version
+m4_define(x_minor, 2) # project's minor version
 m4_include(ax_init_standard_project.m4)
 AC_INIT(x_package_name, x_version, x_package_name)
 AM_INIT_AUTOMAKE([1.9 tar-pax])
@@ -29,9 +29,11 @@ AX_BUILD_HTML
 #AX_CHECK_QT([QT], [QtCore QtGui QtNetwork], [QtWidgets])
 #AX_QT_NO_KEYWORDS
 
-AC_CHECK_PROG(CORDOVA, [cordova android], [yes], [no],
+AC_CHECK_PROG(CORDOVA, [cordova android], [1], [0],
                        [${PATH}${PATH_SEPARATOR}${ANDROID_HOME}/tools])
-AM_CONDITIONAL(CORDOVA, [test ${CORDOVA} = "yes"])
+AM_CONDITIONAL(CORDOVA, [test ${CORDOVA} = "1"])
+AX_SUBST(CORDOVA)
+
 AC_CONFIG_FILES([html/index.html])
 AC_CONFIG_FILES([cordova/makefile])
 AC_CONFIG_FILES([cordova/config.xml])

cordova/makefile.am

@@ -19,10 +19,14 @@ ${ANDROID_SRC}:
 	    ( cp -r "@srcdir@/$${file}" "$${file}" && \
 	      chmod -R u+w "$${file}" ); \
 	done
-	cordova build --debug
+	if [ "$$(whoami)" != "root" ]; then \
+	  cordova build --debug; \
+	fi
 
 ${ANDROID}: ${ANDROID_SRC}
-	mv $< $@
+	if [ "$$(whoami)" != "root" ]; then \
+	  mv $< $@; \
+	fi
 
 clean-local:
 	platforms/android/cordova/clean

cordova/platforms/android/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<manifest android:hardwareAccelerated="true" android:versionCode="123" android:versionName="0.1.23" package="ch.safechat" xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest android:hardwareAccelerated="true" android:versionCode="223" android:versionName="0.2.23" package="ch.safechat" xmlns:android="http://schemas.android.com/apk/res/android">
     <supports-screens android:anyDensity="true" android:largeScreens="true" android:normalScreens="true" android:resizeable="true" android:smallScreens="true" android:xlargeScreens="true" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

cordova/platforms/android/res/xml/config.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="ch.safechat" version="0.1.23" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="ch.safechat" version="0.2.23" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <preference name="loglevel" value="DEBUG" />
     <feature name="Whitelist">
         <param name="android-package" value="org.apache.cordova.whitelist.WhitelistPlugin" />

html/index.html.in

@@ -24,13 +24,17 @@
 
 <ul id="menu" style="display: none">
   <li onclick="backup()">Download Backup</li>
-  <li class="toolbutton"><label for="restore">Restore Backup</label><input autocomplete="off" type="file" accept="text/*" id="restore" /></li>
+  <li class="toolbutton"><label for="restore">Restore Backup</label><input autocomplete="off" type="file" accept="*.bak" id="restore" /></li>
-  <li onclick="groups()">Edit Groups</li>
+  <li id="groups" onclick="groups()">Edit Groups</li>
-  <li href="safechat.apk"><a href="safechat.apk">Download Android-App</a></li>
+  <li id="android-download" href="safechat.apk"><a href="safechat.apk">Download Android-App</a></li>
 </ul>
-<script>
+<script type="text/javascript">
-  $("#restore").change(function(evt){restore(evt)});
+  $(function() { // on load: without cordova, remove andoid-download
+    if ("@CORDOVA@" == "0") $("#android-download").hide();
     if (!window.FileReader) $("#restore").hide(); // not supported by browser
+    $("#groups").hide();
+  })
+  $("#restore").change(function(evt){restore(evt)});
 </script>
 
 <div id="main">

html/safechat.css

@@ -121,6 +121,10 @@ td:last-child {
   list-style-type: none;
   border: 1px solid black;
 }
+#menu a {
+  text-decoration: inherit;
+  color: inherit;
+}
 #menu li {
   padding: 0 1em 0 1em;
 }