android: readParcelable compatibility.

.gitea/workflows/build.yaml

@@ -24,7 +24,7 @@ jobs:
         uses: android-actions/setup-android@v3
         with:
           packages: 'tools platform-tools build-tools;34.0.0 platforms;android-34 ndk;26.3.11579264'
-      - run: sudo apt update && sudo apt install -y doxygen graphviz mingw-w64
+      - run: sudo apt update && sudo apt install -y doxygen graphviz mingw-w64 libgpgme11
       - run: ANDROID_SDK=$HOME/.android/sdk make -j`nproc` all docs
       - run: docker build .
       - uses: actions/upload-artifact@v3

GNUmakefile

@@ -3,14 +3,14 @@
 MAKEFLAGS += --warn-undefined-variables
 MAKEFLAGS += --no-builtin-rules
 
-VERSION_CODE := 27
-VERSION_NUMBER := 0.0.23
-VERSION_NAME := Me upon my pony on my boat.
+VERSION_CODE := 28
+VERSION_NUMBER := 0.0.24-wip
+VERSION_NAME := Honey bunches of boats.
 
 SQLITE_URL := https://www.sqlite.org/2024/sqlite-amalgamation-3460100.zip
 BUNDLETOOL_URL := https://github.com/google/bundletool/releases/download/1.17.0/bundletool-all-1.17.0.jar
-LINUXDEPLOY_URL := https://github.com/linuxdeploy/linuxdeploy/releases/download/1-alpha-20240109-1/linuxdeploy-x86_64.AppImage
-LINUXDEPLOY_MD5 := 659d69326199524552bfbbe46cb0adae  out/linuxdeploy
+APPIMAGETOOL_URL := https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage
+APPIMAGETOOL_MD5 := e989fadfc4d685fd3d6aeeb9b525d74d  out/appimagetool
 
 PROJECT = tildefriends
 BUILD_DIR ?= out
@@ -1077,17 +1077,22 @@ endif
 
 out/tildefriends-x86_64.AppImage: out/release/tildefriends out/data.zip
 	@echo "[appimage] $$@"
-	@mkdir -p out/AppDir/usr/bin
-	@mkdir -p out/AppDir/usr/share/applications
-	@mkdir -p out/AppDir/usr/share/icons/hicolor/scalable/apps
-	@echo $(LINUXDEPLOY_MD5) > out/linuxdeploy.md5
-	@test -x out/linuxdeploy || curl -q -L -o out/linuxdeploy $(LINUXDEPLOY_URL) && md5sum -c out/linuxdeploy.md5 && chmod +x out/linuxdeploy
-	@echo "[Desktop Entry]\nName=tildefriends\nExec=tildefriends\nIcon=tildefriends\nType=Application\nCategories=Network" > out/AppDir/usr/share/applications/tildefriends.desktop
-	@cp src/ios/tildefriends.svg out/AppDir/usr/share/icons/hicolor/scalable/apps/
-	@cat out/release/tildefriends out/data.zip > out/AppDir/usr/bin/tildefriends
-	@chmod +x out/AppDir/usr/bin/tildefriends
-	@cd out; ./linuxdeploy --appimage-extract; cd ..
-	@unset SOURCE_DATE_EPOCH; cd out; squashfs-root/usr/bin/linuxdeploy --appdir AppDir --output appimage; cd ..
+	@rm -rf out/tildefriends.AppDir
+	@mkdir -p out/tildefriends.AppDir/usr/bin
+	@mkdir -p out/tildefriends.AppDir/usr/share/applications
+	@mkdir -p out/tildefriends.AppDir/usr/share/icons/hicolor/scalable/apps
+	@mkdir -p out/tildefriends.AppDir/usr/share/tildefriends
+	@echo $(APPIMAGETOOL_MD5) > out/appimagetool.md5
+	@test -x out/appimagetool || curl -q -L -o out/appimagetool $(APPIMAGETOOL_URL) && md5sum -c out/appimagetool.md5 && chmod +x out/appimagetool
+	@echo "[Desktop Entry]\nName=tildefriends\nExec=/usr/bin/tildefriends\nIcon=/usr/share/icons/hicolor/scalable/apps/tildefriends\nType=Application\nCategories=Network" > out/tildefriends.AppDir/tildefriends.desktop
+	@cp src/ios/tildefriends.svg out/tildefriends.AppDir/usr/share/icons/hicolor/scalable/apps/
+	@cp src/ios/tildefriends.svg out/tildefriends.AppDir/
+	@cp out/release/tildefriends out/tildefriends.AppDir/usr/bin/
+	@cp out/data.zip out/tildefriends.AppDir/usr/share/tildefriends/data.zip
+	@echo "#!/bin/sh\n\$${APPDIR}/usr/bin/tildefriends run -z \$$APPDIR/usr/share/tildefriends/data.zip" > out/tildefriends.AppDir/AppRun
+	@chmod +x out/tildefriends.AppDir/AppRun
+	@cd out; ./appimagetool --appimage-extract; cd ..
+	@unset SOURCE_DATE_EPOCH; PATH=$$PATH:out/squashfs-root/usr/bin ARCH=x86_64 out/squashfs-root/usr/bin/appimagetool out/tildefriends.AppDir out/tildefriends-x86_64.AppImage
 
 appimage: out/tildefriends-x86_64.AppImage
 .PHONY: appimage

README.md

@@ -19,8 +19,27 @@ Scuttlebutt, as well as a platform for writing and running web applications.
 Builds on Linux (x86_64 and aarch64), MacOS, OpenBSD, and Haiku. Builds for
 all of those host platforms plus mingw64, iOS, and android.
 
-1. Requires openssl (`libssl-dev`, in debian-speak). All other dependencies
-   are kept up to date in the tree.
+Tilde Friends uses git submodules, so either:
+
+```
+git clone --recurse-submodules https://dev.tildefriends.net/cory/tildefriends.git
+```
+
+or:
+
+```
+git clone https://dev.tildefriends.net/cory/tildefriends.git
+cd tildefriends
+git submodule update --init --recursive
+```
+
+The `.tar.xz` releases are all-inclusive.
+
+The gitea `Source Code (ZIP)` and `Source Code (TAR.GZ)` are missing
+dependencies, so don't use those.
+
+1. On Linux only, system OpenSSL libraries (`libssl-dev`, in debian-speak) is
+   assumed to be available.
 2. To build, run `make debug` or `make release`. An executable will be
    generated in a subdirectory of `out/`.
 3. It's possible to build for Android, iOS, and Windows on Linux, if you have

default.nix

@@ -21,14 +21,14 @@
 }:
 pkgs.stdenv.mkDerivation rec {
   pname = "tildefriends";
-  version = "0.0.22";
+  version = "0.0.23";
 
   src = pkgs.fetchFromGitea {
     domain = "dev.tildefriends.net";
     owner = "cory";
     repo = "tildefriends";
     rev = "v${version}";
-    hash = "sha256-Su+y++zVXmYNbwfhCP6w5e36oxW5fkURPFzFLjbyFEI=";
+    hash = "sha256-ukZpi+BXRTFGbdvd5ApmctTo8bjtPJMHjqFPgVSyBWU=";
     fetchSubmodules = true;
   };
 

src/android/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	package="com.unprompted.tildefriends"
-	android:versionCode="27"
-	android:versionName="0.0.23">
+	android:versionCode="28"
+	android:versionName="0.0.24-wip">
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
 	<uses-permission android:name="android.permission.INTERNET"/>
 	<application

src/android/com/unprompted/tildefriends/TildeFriendsActivity.java

@@ -11,6 +11,7 @@ import android.net.ConnectivityManager;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Environment;
+import android.os.FileObserver;
 import android.os.IBinder;
 import android.os.Parcel;
 import android.os.ParcelFileDescriptor;
@@ -42,12 +43,6 @@ import java.io.File;
 import java.io.FileOutputStream;
 import java.io.FileReader;
 import java.io.OutputStream;
-import java.nio.file.FileSystems;
-import java.nio.file.Paths;
-import java.nio.file.StandardWatchEventKinds;
-import java.nio.file.WatchEvent;
-import java.nio.file.WatchKey;
-import java.nio.file.WatchService;
 import java.util.concurrent.TimeUnit;
 
 public class TildeFriendsActivity extends Activity {
@@ -55,9 +50,9 @@ public class TildeFriendsActivity extends Activity {
 	TildeFriendsWebView web_view;
 	String base_url;
 	String port_file_path;
-	Thread thread;
 	Thread server_thread;
 	ServiceConnection service_connection;
+	FileObserver observer;
 
 	private ValueCallback<Uri[]> upload_message;
 	private final static int FILECHOOSER_RESULT = 1;
@@ -95,56 +90,9 @@ public class TildeFriendsActivity extends Activity {
 
 		TildeFriendsActivity activity = this;
 
-		thread = new Thread(new Runnable() {
-			@Override
-			public void run() {
-				Log.w("tildefriends", "Watching for changes in: " + getFilesDir().toString());
-				try (WatchService watcher = FileSystems.getDefault().newWatchService()) {
-					Paths.get(getFilesDir().toString()).register(
-						watcher,
-						StandardWatchEventKinds.ENTRY_CREATE,
-						StandardWatchEventKinds.ENTRY_MODIFY);
-					while (true) {
-						WatchKey key = watcher.poll(100, TimeUnit.MILLISECONDS);
-						boolean attempt_it = true;
-						if (key != null)
-						{
-							attempt_it = false;
-							for (WatchEvent event : key.pollEvents()) {
-								if (event.context().toString().equals("port.txt")) {
-									Log.w("tildefriends", "Observed file write: " + event.context().toString());
-									attempt_it = true;
-								}
-							}
-						}
-						if (attempt_it) {
-							int port = read_port(port_file_path);
-							if (port >= 0) {
-								base_url = "http://127.0.0.1:" + String.valueOf(port) + "/";
-								activity.runOnUiThread(() -> {
-									activity.hide_status();
-									web_view.loadUrl(base_url);
-								});
-								break;
-							} else {
-								activity.runOnUiThread(() -> {
-									activity.set_status("Waiting to connect...");
-								});
-							}
-						}
-						if (key != null && !key.reset()) {
-							Log.w("tildefriends", "watcher is no longer valid");
-							break;
-						}
-					}
-				} catch (java.io.IOException e) {
-					Log.w("tildefriends", "IOException: " + e.toString());
-				} catch (InterruptedException e) {
-					Log.w("tildefriends", "InterruptedException: " + e.toString());
-				}
-			}
-		});
-		thread.start();
+		Log.w("tildefriends", "Watching for changes in: " + getFilesDir().toString());
+		observer = make_file_observer(getFilesDir().toString(), port_file_path);
+		observer.startWatching();
 
 		set_status("Starting server...");
 		server_thread = new Thread(new Runnable() {
@@ -392,11 +340,14 @@ public class TildeFriendsActivity extends Activity {
 
 	private int read_port(String path) {
 		try (BufferedReader reader = new BufferedReader(new FileReader(path))) {
-			return Integer.parseInt(reader.readLine());
+			String line = reader.readLine();
+			if (line != null) {
+				return Integer.parseInt(line);
+			}
 		} catch (NumberFormatException e) {
 			e.printStackTrace();
 		} catch (java.io.FileNotFoundException e) {
-			e.printStackTrace();
+			Log.w("tildefriends", "Port file does not yet exist.");
 		} catch (java.io.IOException e) {
 			e.printStackTrace();
 		}
@@ -461,6 +412,36 @@ public class TildeFriendsActivity extends Activity {
 		}
 	}
 
+	private void check_port_file(String path) {
+		int port = read_port(port_file_path);
+		if (port >= 0) {
+			base_url = "http://127.0.0.1:" + String.valueOf(port) + "/";
+			runOnUiThread(() -> {
+				hide_status();
+				web_view.loadUrl(base_url);
+			});
+			observer = null;
+		} else {
+			runOnUiThread(() -> {
+				set_status("Waiting to connect...");
+			});
+		}
+	}
+
+	@SuppressWarnings("deprecation")
+	private FileObserver make_file_observer(String dir, String path) {
+		FileObserver file_observer = new FileObserver(dir, FileObserver.ALL_EVENTS) {
+			@Override
+			public void onEvent(int event, String file) {
+				if (observer != null) {
+					check_port_file(path);
+				}
+			}
+		};
+		check_port_file(path);
+		return file_observer;
+	}
+
 	@SuppressWarnings("deprecation")
 	private void set_database_path()
 	{

src/android/com/unprompted/tildefriends/TildeFriendsSandboxService.java

@@ -41,7 +41,7 @@ public class TildeFriendsSandboxService extends Service {
 			@Override
 			protected boolean onTransact(int code, Parcel data, Parcel reply, int flags) {
 				if (code == START_CALL) {
-					ParcelFileDescriptor pfd = data.readParcelable(ParcelFileDescriptor.class.getClassLoader(), ParcelFileDescriptor.class);
+					ParcelFileDescriptor pfd = read_pfd(data);
 					if (pfd != null) {
 						Log.w("tildefriends", "fd is " + pfd.getFd());
 						start_thread(pfd.detachFd());
@@ -56,4 +56,9 @@ public class TildeFriendsSandboxService extends Service {
 			}
 		};
 	}
+
+	@SuppressWarnings("deprecation")
+	static private ParcelFileDescriptor read_pfd(Parcel data) {
+		return data.readParcelable(ParcelFileDescriptor.class.getClassLoader());
+	}
 }