Clear out timestamp and file modes on classes.dex, too.

* Set android:debuggable=false.
 * Call native code through JNI only.  Having a native executable on disk and exec-ing it no longer seems possible.
 * Do all the Tilde Friends things in one process, without a proper sandbox, until I can wire up a restricted service worker process.
 * Jam Android App Bundle (.aab) building into the makefile.
 * Yuck.

.fdroid.yml

@@ -0,0 +1,40 @@
+Categories:
+  - Internet
+License: MIT
+
+AutoName: tildefriends
+AuthorName: Cory McWilliams
+AuthorEmail: cory@tildefriends.net
+
+RepoType: git
+Repo: https://dev.tildefriends.net/cory/tildefriends.git
+
+Builds:
+  - versionName: 0.0.21-wip
+    versionCode: 22
+    commit: 09b6a00731d45fa160b23a2c44be6def98d92d6a
+    subdir: src/android
+    submodules: true
+    sudo:
+      - apt-get update
+      - apt-get install -y ant make zip
+    androidupdate:
+      - no
+    scandelete:
+      - deps/libuv/docs/src/static/diagrams.key/Index.zip
+      - deps/openssl_src/cloudflare-quiche/*
+      - deps/openssl_src/fuzz/*
+      - deps/openssl_src/gost-engine/*
+      - deps/openssl_src/test/*
+      - deps/openssl_src/tlslite-ng/*
+    prebuild:
+      - sdkmanager "platforms;android-34" "build-tools;34.0.0"
+    build:
+      - mkdir bin/
+      - ANDROID_SDK=$$SDK$$ ANDROID_NDK=$$NDK$$ ANDROID_NDK_ROOT=$$NDK$$ make -C ../../ -j`nproc` fdroid
+    ndk: r26d
+
+AutoUpdateMode: Version ^v[0-9\.]+$
+UpdateCheckMode: Tags
+CurrentVersion: 0.0.21-wip
+CurrentVersionCode: 22

.gitea/workflows/build.yaml

@@ -0,0 +1,15 @@
+name: Build Tilde Friends
+run-name: ${{ gitea.actor }} running 🚀
+on: [push]
+
+jobs:
+  Build-All:
+    runs-on: ubuntu-latest
+    steps:
+      - name: check out code
+        uses: actions/checkout@v4
+        with:
+          submodules: true
+      - run: sudo apt update && sudo apt install -y doxygen mingw-w64
+      - run: make all -j`nproc` docs
+      - run: docker build .

.gitignore

@@ -1,11 +1,17 @@
+build/
+*.core
 db.*
 deps/ios_toolchain/
 deps/openssl/
 dist/
 .keys
+logs/
 **/node_modules
 out
+repo/
+result
 *.swo
 *.swp
+tmp/
+unsigned/
 .zsign_cache/
-result

.gitmodules

@@ -19,3 +19,7 @@
 [submodule "deps/picohttpparser"]
 	path = deps/picohttpparser
 	url = https://github.com/h2o/picohttpparser.git
+[submodule "deps/openssl_src"]
+	path = deps/openssl_src
+	url = https://github.com/openssl/openssl.git
+	shallow = true

GNUmakefile

@@ -3,12 +3,13 @@
 MAKEFLAGS += --warn-undefined-variables
 MAKEFLAGS += --no-builtin-rules
 
-VERSION_CODE := 21
+VERSION_CODE := 25
-VERSION_NUMBER := 0.0.21-wip
+VERSION_NUMBER := 0.0.21.1
-VERSION_NAME := Psst.  Look behind you.
+VERSION_NAME := What are we even doing here?
 
 SQLITE_URL := https://www.sqlite.org/2024/sqlite-amalgamation-3460000.zip
 LIBUV_URL := https://dist.libuv.org/dist/v1.48.0/libuv-v1.48.0.tar.gz
+BUNDLETOOL_URL := https://github.com/google/bundletool/releases/download/1.17.0/bundletool-all-1.17.0.jar
 
 PROJECT = tildefriends
 BUILD_DIR ?= out
@@ -16,9 +17,13 @@ UNAME_S := $(shell uname -s)
 UNAME_M := $(shell uname -m)
 
 ANDROID_SDK ?= ~/Android/Sdk
+BUNDLETOOL = out/bundletool.jar
 
 HAVE_WIN := 0
 
+export SOURCE_DATE_EPOCH=1
+export TZ=UTC
+
 ifeq ($(UNAME_S),Darwin)
 BUILD_TYPES := macosdebug macosrelease iosdebug iosrelease iossimdebug iossimrelease
 else ifeq ($(UNAME_S),Linux)
@@ -55,13 +60,17 @@ CFLAGS += \
 	-ffunction-sections \
 	-fdata-sections \
 	-fno-exceptions \
-	-g
+	-g \
+	-flto
+LDFLAGS += \
+	-flto=auto \
+	-Wno-attributes
 
 ANDROID_MIN_SDK_VERSION := 24
 ANDROID_TARGET_SDK_VERSION := 34
 ANDROID_BUILD_TOOLS := $(ANDROID_SDK)/build-tools/34.0.0
 ANDROID_PLATFORM := $(ANDROID_SDK)/platforms/android-$(ANDROID_TARGET_SDK_VERSION)
-ANDROID_NDK ?= $(ANDROID_SDK)/ndk/26.2.11394342
+ANDROID_NDK ?= $(ANDROID_SDK)/ndk/26.3.11579264
 
 ANDROID_ARMV7A_TARGETS := \
 	out/androiddebug-armv7a/tildefriends \
@@ -90,7 +99,7 @@ BUILD_TYPES += \
 	androidrelease-x86 \
 	androiddebug-x86_64 \
 	androidrelease-x86_64
-all: out/TildeFriends-arm-debug.apk out/TildeFriends-arm-release.apk out/TildeFriends-x86-debug.apk out/TildeFriends-x86-release.apk
+all: out/TildeFriends-arm-debug.apk out/TildeFriends-arm-release.apk out/TildeFriends-x86-debug.apk out/TildeFriends-x86-release.apk out/TildeFriends-release.fdroid.apk
 endif
 
 WINDOWS_TARGETS := \
@@ -150,9 +159,10 @@ ANDROID_RELEASE_TARGETS := $(filter-out $(DEBUG_TARGETS),$(ANDROID_TARGETS))
 NONANDROID_RELEASE_TARGETS := $(filter-out $(ANDROID_ARM64_TARGETS),$(RELEASE_TARGETS))
 NONANDROID_TARGETS := $(filter-out $(ANDROID_TARGETS),$(ALL_TARGETS))
 NONMACOS_TARGETS := $(filter-out $(MACOS_TARGETS) $(IOS_TARGETS) $(IOSSIM_TARGETS),$(ALL_TARGETS))
+DEADSTRIP_TARGETS := $(filter-out $(ANDROID_TARGETS),$(NONMACOS_TARGETS))
 
 $(NONANDROID_TARGETS): CFLAGS += -fno-omit-frame-pointer
-$(filter-out $(ANDROID_TARGETS) $(WINDOWS_TARGETS),$(ALL_TARGETS)): LDFLAGS += -rdynamic
+$(filter-out $(WINDOWS_TARGETS),$(ALL_TARGETS)): LDFLAGS += -rdynamic
 $(ANDROID_TARGETS): CFLAGS += \
 	--sysroot $(ANDROID_NDK)/toolchains/llvm/prebuilt/linux-x86_64/sysroot \
 	-fPIC \
@@ -205,7 +215,7 @@ $(ANDROID_X86_TARGETS): LDFLAGS += -Ldeps/openssl/android/x86/usr/local/lib
 $(ANDROID_X86_64_TARGETS): CFLAGS += -Ideps/openssl/android/x86_64/usr/local/include
 $(ANDROID_X86_64_TARGETS): LDFLAGS += -Ldeps/openssl/android/x86_64/usr/local/lib
 $(NONMACOS_TARGETS): CFLAGS += -Wno-cast-function-type
-$(NONMACOS_TARGETS): LDFLAGS += -Wl,--gc-sections
+$(DEADSTRIP_TARGETS): LDFLAGS += -Wl,--gc-sections
 $(IOS_TARGETS): CFLAGS += -mios-version-min=9.0 -Ideps/openssl/ios/ios64-xcrun/usr/local/include
 $(IOS_TARGETS): LDFLAGS += -Ldeps/openssl/ios/ios64-xcrun/usr/local/lib
 $(IOSSIM_TARGETS): CFLAGS += -Ideps/openssl/ios/iossimulator-xcrun/usr/local/include
@@ -616,7 +626,7 @@ $(IOS_TARGETS) $(IOSSIM_TARGETS): LDFLAGS += \
 
 unix: debug release
 win: windebug winrelease
-all: $(BUILD_TYPES) default.nix
+all: $(BUILD_TYPES)
 .PHONY: all win unix
 
 ALL_APP_OBJS := \
@@ -673,10 +683,6 @@ src/android/AndroidManifest.xml : $(firstword $(MAKEFILE_LIST))
 		-e 's/android:targetSdkVersion="[[:digit:]]*"/android:targetSdkVersion="$(ANDROID_TARGET_SDK_VERSION)"/' \
 		$@
 
-default.nix : $(firstword $(MAKEFILE_LIST))
-	@echo "[version] $@"
-	@sed -i -e 's/version = ".*";/version = "$(VERSION_NUMBER)";/' $@
-
 # Android support.
 out/res/layout_activity_main.xml.flat: src/android/res/layout/activity_main.xml
 	@mkdir -p $(dir $@)
@@ -689,8 +695,25 @@ out/res/drawable_icon.xml.flat: src/android/res/drawable/icon.xml
 	@$(ANDROID_BUILD_TOOLS)/aapt2 compile -o out/res/ src/android/res/drawable/icon.xml
 
 out/apk/res.apk out/gen/com/unprompted/tildefriends/R.java: out/res/layout_activity_main.xml.flat out/res/drawable_icon.xml.flat src/android/AndroidManifest.xml
-	@mkdir -p $(dir $@)
+	@echo [aapt2 link] res.apk
-	@$(ANDROID_BUILD_TOOLS)/aapt2 link -I $(ANDROID_PLATFORM)/android.jar out/res/layout_activity_main.xml.flat out/res/drawable_icon.xml.flat --manifest src/android/AndroidManifest.xml -o out/apk/res.apk --java out/gen/
+	@mkdir -p out/apk/
+	@$(ANDROID_BUILD_TOOLS)/aapt2 link -I $(ANDROID_PLATFORM)/android.jar out/res/layout_activity_main.xml.flat out/res/drawable_icon.xml.flat \
+		--min-sdk-version $(ANDROID_MIN_SDK_VERSION) \
+		--target-sdk-version $(ANDROID_TARGET_SDK_VERSION) \
+		--manifest src/android/AndroidManifest.xml \
+		-o out/apk/res.apk \
+		--java out/gen/
+
+out/apk/res.fdroid.apk out/gen_fdroid/com/unprompted/tildefriends/R.java: out/res/layout_activity_main.xml.flat out/res/drawable_icon.xml.flat src/android/AndroidManifest.xml
+	@echo [aapt2 link] res.fdroid.apk
+	@mkdir -p out/apk/
+	@$(ANDROID_BUILD_TOOLS)/aapt2 link -I $(ANDROID_PLATFORM)/android.jar out/res/layout_activity_main.xml.flat out/res/drawable_icon.xml.flat \
+		--min-sdk-version $(ANDROID_MIN_SDK_VERSION) \
+		--target-sdk-version $(ANDROID_TARGET_SDK_VERSION) \
+		--rename-manifest-package com.unprompted.tildefriends.fdroid \
+		--manifest src/android/AndroidManifest.xml \
+		-o out/apk/res.fdroid.apk \
+		--java out/gen_fdroid/
 
 JAVA_FILES := out/gen/com/unprompted/tildefriends/R.java $(wildcard src/android/com/unprompted/tildefriends/*.java)
 CLASS_FILES := $(foreach src,$(JAVA_FILES),out/classes/com/unprompted/tildefriends/$(notdir $(src:.java=.class)))
@@ -702,7 +725,7 @@ $(CLASS_FILES) &: $(JAVA_FILES)
 out/apk/classes.dex: $(CLASS_FILES)
 	@mkdir -p $(dir $@)
 	@echo "[d8] $@"
-	@$(ANDROID_BUILD_TOOLS)/d8 --$(BUILD_TYPE) --lib $(ANDROID_PLATFORM)/android.jar --output $(dir $@) out/classes/com/unprompted/tildefriends/*.class
+	@$(ANDROID_BUILD_TOOLS)/d8 --lib $(ANDROID_PLATFORM)/android.jar --output $(dir $@) out/classes/com/unprompted/tildefriends/*.class
 
 PACKAGE_DIRS := \
 	apps/ \
@@ -711,25 +734,79 @@ PACKAGE_DIRS := \
 	deps/prettier/ \
 	deps/lit/
 
-RAW_FILES := $(filter-out apps/blog% apps/issues% apps/welcome% apps/journal% %.map, $(shell find $(PACKAGE_DIRS) -type f))
+RAW_FILES := $(sort $(filter-out apps/blog% apps/issues% apps/welcome% apps/journal% %.map, $(shell find $(PACKAGE_DIRS) -type f)))
 
 out/apk/TildeFriends-arm-debug.unsigned.apk: BUILD_TYPE := debug
 out/apk/TildeFriends-arm-release.unsigned.apk: BUILD_TYPE := release
 out/apk/TildeFriends-x86-debug.unsigned.apk: BUILD_TYPE := debug
 out/apk/TildeFriends-x86-release.unsigned.apk: BUILD_TYPE := release
+out/apk/TildeFriends-release.fdroid.unsigned.apk: BUILD_TYPE := release
 
 out/apk/TildeFriends-arm-debug.unsigned.apk: out/apk/classes.dex out/androiddebug/tildefriends out/androiddebug-armv7a/tildefriends $(RAW_FILES) out/apk/res.apk
 out/apk/TildeFriends-arm-release.unsigned.apk: out/apk/classes.dex out/androidrelease/tildefriends out/androidrelease-armv7a/tildefriends $(RAW_FILES) out/apk/res.apk
 out/apk/TildeFriends-x86-debug.unsigned.apk: out/apk/classes.dex out/androiddebug-x86_64/tildefriends out/androiddebug-x86/tildefriends $(RAW_FILES) out/apk/res.apk
 out/apk/TildeFriends-x86-release.unsigned.apk: out/apk/classes.dex out/androidrelease-x86_64/tildefriends out/androidrelease-x86/tildefriends $(RAW_FILES) out/apk/res.apk
+out/apk/TildeFriends-release.fdroid.unsigned.apk: out/apk/classes.dex out/androidrelease/tildefriends out/androidrelease-armv7a/tildefriends out/androidrelease-x86_64/tildefriends out/androidrelease-x86/tildefriends $(RAW_FILES) out/apk/res.fdroid.apk
+
+$(BUNDLETOOL):
+	@echo [curl] $(BUNDLETOOL_URL) TO $@
+	@curl -q -L --create-dirs -o $@ $(BUNDLETOOL_URL)
+
+out/TildeFriends.aab: out/apk/classes.dex $(filter-out %debug%, $(ANDROID_TARGETS)) $(RAW_FILES) out/apk/res.apk src/android/AndroidManifest.xml $(BUNDLETOOL)
+	@rm -rf out/aab/staging/
+	@mkdir -p out/aab/staging
+	@$(ANDROID_BUILD_TOOLS)/aapt2 link --proto-format -o out/aab/temporary.apk \
+		-I $(ANDROID_PLATFORM)/android.jar \
+		--min-sdk-version $(ANDROID_MIN_SDK_VERSION) \
+		--target-sdk-version $(ANDROID_TARGET_SDK_VERSION) \
+		--manifest src/android/AndroidManifest.xml \
+		-R out/res/layout_activity_main.xml.flat \
+		-R out/res/drawable_icon.xml.flat \
+		--auto-add-overlay
+	@unzip out/aab/temporary.apk -d out/aab/staging/
+	@mkdir -p out/aab/staging/root/deps
+	@mkdir -p out/aab/staging/classes
+	@mkdir -p out/aab/staging/dex
+	@mkdir -p out/aab/staging/manifest
+	@mv out/aab/staging/AndroidManifest.xml out/aab/staging/manifest/AndroidManifest.xml
+	@cp out/apk/classes.dex out/aab/staging/dex/
+	@rm -fv out/base.zip
+	@mkdir -p out/aab/staging/lib/arm64-v8a out/aab/staging/lib/armeabi-v7a out/aab/staging/lib/x86_64 out/aab/staging/lib/x86
+	@cp out/androidrelease/tildefriends out/aab/staging/lib/arm64-v8a/libtildefriends.so
+	@cp out/androidrelease-armv7a/tildefriends out/aab/staging/lib/armeabi-v7a/libtildefriends.so
+	@cp out/androidrelease-x86_64/tildefriends out/aab/staging/lib/x86_64/libtildefriends.so
+	@cp out/androidrelease-x86/tildefriends out/aab/staging/lib/x86/libtildefriends.so
+	@$(ANDROID_NDK)/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip out/aab/staging/lib/arm64-v8a/libtildefriends.so
+	@$(ANDROID_NDK)/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip out/aab/staging/lib/armeabi-v7a/libtildefriends.so
+	@$(ANDROID_NDK)/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip out/aab/staging/lib/x86_64/libtildefriends.so
+	@$(ANDROID_NDK)/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip out/aab/staging/lib/x86/libtildefriends.so
+	@cp -r apps/ out/aab/staging/root/
+	@rm -rf out/aab/staging/root/apps/welcome*
+	@cp -r core/ out/aab/staging/root/
+	@cp -r deps/prettier/ out/aab/staging/root/deps/
+	@cp -r deps/lit/ out/aab/staging/root/deps/
+	@cp -r deps/codemirror/ out/aab/staging/root/deps/
+	@cd out/aab/staging/; zip -r ../base.zip *; cd ../../../
+	@java -jar $(BUNDLETOOL) build-bundle --overwrite --config=src/android/BundleConfig.json --modules=out/aab/base.zip --output=$@
+	@jarsigner -keystore .keys/android.jks $@ androidKey -storepass android
+
+aab: out/TildeFriends.aab
+.PHONY: aab
+
+out/TildeFriends.apks: out/TildeFriends.aab $(BUNDLETOOL)
+	@java -jar $(BUNDLETOOL) build-apks --bundle out/TildeFriends.aab --overwrite --output $@ --ks .keys/android.jks --ks-key-alias androidKey --ks-pass pass:android
+
+aabgo: out/TildeFriends.apks $(BUNDLETOOL)
+	@java -jar $(BUNDLETOOL) install-apks --apks out/TildeFriends.apks
+	@adb shell am start com.unprompted.tildefriends/.TildeFriendsActivity
 
 out/apk/TildeFriends-arm-%.unsigned.apk:
 	@mkdir -p $(dir $@) out/apk-arm-$(BUILD_TYPE)/lib/arm64-v8a/ out/apk-arm-$(BUILD_TYPE)/lib/armeabi-v7a/
 	@echo "[aapt] $@"
-	@cp out/android$(BUILD_TYPE)/tildefriends out/apk-arm-$(BUILD_TYPE)/lib/arm64-v8a/tildefriends.so
+	@cp out/android$(BUILD_TYPE)/tildefriends out/apk-arm-$(BUILD_TYPE)/lib/arm64-v8a/libtildefriends.so
-	@cp out/android$(BUILD_TYPE)-armv7a/tildefriends out/apk-arm-$(BUILD_TYPE)/lib/armeabi-v7a/tildefriends.so
+	@cp out/android$(BUILD_TYPE)-armv7a/tildefriends out/apk-arm-$(BUILD_TYPE)/lib/armeabi-v7a/libtildefriends.so
-	@$(ANDROID_NDK)/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip out/apk-arm-$(BUILD_TYPE)/lib/arm64-v8a/tildefriends.so
+	@$(ANDROID_NDK)/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip out/apk-arm-$(BUILD_TYPE)/lib/arm64-v8a/libtildefriends.so
-	@$(ANDROID_NDK)/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip out/apk-arm-$(BUILD_TYPE)/lib/armeabi-v7a/tildefriends.so
+	@$(ANDROID_NDK)/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip out/apk-arm-$(BUILD_TYPE)/lib/armeabi-v7a/libtildefriends.so
 	@cp out/apk/res.apk $@.zip
 	@cp out/apk/classes.dex out/apk-arm-$(BUILD_TYPE)/
 	@cd out/apk-arm-$(BUILD_TYPE) && zip -u ../../$@.zip -q -9 -r . && cd ../../
@@ -739,16 +816,38 @@ out/apk/TildeFriends-arm-%.unsigned.apk:
 out/apk/TildeFriends-x86-%.unsigned.apk:
 	@mkdir -p $(dir $@) out/apk-x86-$(BUILD_TYPE)/lib/x86_64/ out/apk-x86-$(BUILD_TYPE)/lib/x86/
 	@echo "[aapt] $@"
-	@cp out/android$(BUILD_TYPE)-x86_64/tildefriends out/apk-x86-$(BUILD_TYPE)/lib/x86_64/tildefriends.so
+	@cp out/android$(BUILD_TYPE)-x86_64/tildefriends out/apk-x86-$(BUILD_TYPE)/lib/x86_64/libtildefriends.so
-	@cp out/android$(BUILD_TYPE)-x86/tildefriends out/apk-x86-$(BUILD_TYPE)/lib/x86/tildefriends.so
+	@cp out/android$(BUILD_TYPE)-x86/tildefriends out/apk-x86-$(BUILD_TYPE)/lib/x86/libtildefriends.so
-	@$(ANDROID_NDK)/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip out/apk-x86-$(BUILD_TYPE)/lib/x86_64/tildefriends.so
+	@$(ANDROID_NDK)/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip out/apk-x86-$(BUILD_TYPE)/lib/x86_64/libtildefriends.so
-	@$(ANDROID_NDK)/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip out/apk-x86-$(BUILD_TYPE)/lib/x86/tildefriends.so
+	@$(ANDROID_NDK)/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip out/apk-x86-$(BUILD_TYPE)/lib/x86/libtildefriends.so
 	@cp out/apk/res.apk $@.zip
 	@cp out/apk/classes.dex out/apk-x86-$(BUILD_TYPE)/
 	@cd out/apk-x86-$(BUILD_TYPE) && zip -u ../../$@.zip -q -9 -r . && cd ../../
 	@zip -u $@.zip -q -9 $(RAW_FILES)
 	@$(ANDROID_BUILD_TOOLS)/zipalign -f 4 $@.zip $@
 
+out/apk/TildeFriends-%.fdroid.unsigned.apk:
+	@rm -rf out/apk-fdroid-$(BUILD_TYPE) out/apk-fdroid-$(BUILD_TYPE)-raw
+	@mkdir -p $(dir $@) out/apk-fdroid-$(BUILD_TYPE)/lib/x86_64/ out/apk-fdroid-$(BUILD_TYPE)/lib/x86/ out/apk-fdroid-$(BUILD_TYPE)/lib/arm64-v8a/ out/apk-fdroid-$(BUILD_TYPE)/lib/armeabi-v7a/
+	@echo "[aapt] $@"
+	@cp out/android$(BUILD_TYPE)-x86_64/tildefriends out/apk-fdroid-$(BUILD_TYPE)/lib/x86_64/libtildefriends.so
+	@cp out/android$(BUILD_TYPE)-x86/tildefriends out/apk-fdroid-$(BUILD_TYPE)/lib/x86/libtildefriends.so
+	@cp out/android$(BUILD_TYPE)/tildefriends out/apk-fdroid-$(BUILD_TYPE)/lib/arm64-v8a/libtildefriends.so
+	@cp out/android$(BUILD_TYPE)-armv7a/tildefriends out/apk-fdroid-$(BUILD_TYPE)/lib/armeabi-v7a/libtildefriends.so
+	@$(ANDROID_NDK)/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip out/apk-fdroid-$(BUILD_TYPE)/lib/x86_64/libtildefriends.so
+	@$(ANDROID_NDK)/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip out/apk-fdroid-$(BUILD_TYPE)/lib/x86/libtildefriends.so
+	@$(ANDROID_NDK)/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip out/apk-fdroid-$(BUILD_TYPE)/lib/arm64-v8a/libtildefriends.so
+	@$(ANDROID_NDK)/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip out/apk-fdroid-$(BUILD_TYPE)/lib/armeabi-v7a/libtildefriends.so
+	@cp out/apk/res.fdroid.apk $@.zip
+	@cp out/apk/classes.dex out/apk-fdroid-$(BUILD_TYPE)/classes.dex
+	@touch -d @0 out/apk-fdroid-$(BUILD_TYPE)/classes.dex out/apk-fdroid-$(BUILD_TYPE)/lib/*/libtildefriends.so
+	@chmod 755 out/apk-fdroid-$(BUILD_TYPE)/classes.dex out/apk-fdroid-$(BUILD_TYPE)/lib/*/libtildefriends.so
+	@cd out/apk-fdroid-$(BUILD_TYPE) && zip -X -u ../../$@.zip -q classes.dex lib/*/libtildefriends.so && cd ../../
+	@mkdir out/apk-fdroid-$(BUILD_TYPE)-raw
+	@for i in $(RAW_FILES); do mkdir -p $$(dirname out/apk-fdroid-$(BUILD_TYPE)-raw/$$i) && cp $$i out/apk-fdroid-$(BUILD_TYPE)-raw/$$i && touch -d @0 out/apk-fdroid-$(BUILD_TYPE)-raw/$$i && chmod 644 out/apk-fdroid-$(BUILD_TYPE)-raw/$$i; done
+	@cd out/apk-fdroid-$(BUILD_TYPE)-raw && zip -X -u ../../$@.zip -q $(RAW_FILES) && cd ../../
+	@$(ANDROID_BUILD_TOOLS)/zipalign -f 4 $@.zip $@
+
 out/%.apk: out/apk/%.unsigned.apk
 	@echo "[apksigner] $(notdir $@)"
 	@$(ANDROID_BUILD_TOOLS)/apksigner sign --ks .keys/android.jks --ks-key-alias androidKey --ks-pass pass:android --key-pass pass:android --min-sdk-version $(ANDROID_MIN_SDK_VERSION) --out $@ $<
@@ -761,6 +860,11 @@ out/%.zopfli.apk: out/%.apk
 release-apk: out/TildeFriends-arm-release.zopfli.apk out/TildeFriends-x86-release.zopfli.apk
 .PHONY: release-apk
 
+apkgo: out/TildeFriends-arm-debug.apk
+	@adb install -r $<
+	@adb shell am start com.unprompted.tildefriends/.TildeFriendsActivity
+.PHONY: apkgo
+
 releaseapkgo: out/TildeFriends-arm-release.apk
 	@adb install -r $<
 	@adb shell am start com.unprompted.tildefriends/.TildeFriendsActivity
@@ -841,7 +945,7 @@ fetchdeps:
 
 ANDROID_DEPS := deps/openssl/android/arm64-v8a/usr/local/lib/libssl.a
 $(ANDROID_DEPS):
-	+@tools/ssl-android
+	+@ANDROID_NDK_ROOT=$(ANDROID_NDK) tools/ssl-android
 $(filter $(BUILD_DIR)/android%,$(APP_OBJS)): | $(ANDROID_DEPS)
 
 ifeq ($(HAVE_WIN),1)
@@ -862,7 +966,7 @@ clean:
 	rm -rf $(BUILD_DIR)
 .PHONY: clean
 
-dist: release-apk iosrelease-ipa $(if $(HAVE_WIN), out/winrelease/tildefriends.standalone.exe) default.nix
+dist: release-apk iosrelease-ipa aab $(if $(HAVE_WIN), out/winrelease/tildefriends.standalone.exe) out/TildeFriends-release.fdroid.apk
 	@echo [archive] dist/tildefriends-$(VERSION_NUMBER).tar.xz
 	@rm -rf out/tildefriends-$(VERSION_NUMBER)
 	@mkdir -p dist/ out/tildefriends-$(VERSION_NUMBER)
@@ -893,6 +997,8 @@ dist: release-apk iosrelease-ipa $(if $(HAVE_WIN), out/winrelease/tildefriends.s
 	@cp out/tildefriends-release.ipa dist/TildeFriends-$(VERSION_NUMBER).ipa
 	@test $(HAVE_WIN) && echo "[cp] tildefriends-$(VERSION_NUMBER).exe"
 	@test $(HAVE_WIN) && cp out/winrelease/tildefriends.standalone.exe dist/tildefriends-$(VERSION_NUMBER).exe
+	@cp out/TildeFriends.aab dist/TildeFriends-$(VERSION_NUMBER).aab
+	@cp out/TildeFriends-release.fdroid.apk dist/TildeFriends-$(VERSION_NUMBER).fdroid.apk
 .PHONY: dist
 
 dist-test: dist
@@ -913,3 +1019,6 @@ prettier:
 docs:
 	@doxygen
 .PHONY: docs
+
+fdroid: out/apk/TildeFriends-release.fdroid.unsigned.apk
+.PHONE: fdroid

apps/ssb.json

@@ -1,5 +1,5 @@
 {
 	"type": "tildefriends-app",
 	"emoji": "🐌",
-	"previous": "&TqpkOAi38Oi6gW6guh95KIvWY2M/vjBE8NLLNHK+M00=.sha256"
+	"previous": "&2xK//SIpjFb0+uT5I7MSAGJ3d1FKuI/rlzhcCQd3NME=.sha256"
 }

apps/ssb/tf-compose.js

@@ -538,7 +538,7 @@ class TfComposeElement extends LitElement {
 							id="edit"
 							@input=${this.input}
 							@paste=${this.paste}
-							contenteditable
+							contenteditable="plaintext-only"
 							.innerText=${live(draft.text ?? '')}
 						></span>
 					</div>

core/app.js

@@ -211,10 +211,6 @@ async function socket(request, response, client) {
 				if (process && process.timeout > 0) {
 					setTimeout(ping, process.timeout);
 				}
-			} else if (message.action == 'enableStats') {
-				if (process) {
-					core.enableStats(process, message.enabled);
-				}
 			} else if (message.action == 'resetPermission') {
 				if (process) {
 					process.resetPermission(message.permission);

core/client.js

@@ -1274,7 +1274,6 @@ function _receive_websocket_message(message) {
 		document.getElementById('viewPane').style.display = message.edit_only
 			? 'none'
 			: 'flex';
-		send({action: 'enableStats', enabled: true});
 	} else if (message && message.action == 'ping') {
 		send({action: 'pong'});
 	} else if (message && message.action == 'stats') {

core/core.js

@@ -8,10 +8,6 @@ let gStatsTimer = false;
 const k_content_security_policy =
 	'sandbox allow-downloads allow-top-navigation-by-user-activation';
 
-let k_static_files = [
-	{uri: '/', path: 'index.html', type: 'text/html; charset=UTF-8'},
-];
-
 const k_global_settings = {
 	index: {
 		type: 'string',
@@ -290,7 +286,6 @@ async function getProcessBlob(blobId, key, options) {
 			process.lastActive = Date.now();
 			process.lastPing = null;
 			process.timeout = options.timeout;
-			process.stats = false;
 			process.ready = new Promise(function (resolve, reject) {
 				resolveReady = resolve;
 				rejectReady = reject;
@@ -782,6 +777,10 @@ async function getProcessBlob(blobId, key, options) {
 			}
 			await process.task.execute({name: appSourceName, source: appSource});
 			resolveReady(process);
+			if (!gStatsTimer) {
+				gStatsTimer = true;
+				sendStats();
+			}
 		} catch (error) {
 			if (process.app) {
 				if (process?.task?.onError) {
@@ -918,34 +917,6 @@ async function useAppHandler(
  * @returns
  */
 async function blobHandler(request, response, blobId, uri) {
-	// TODO(tasiaiso): break this down ?
-	for (let i in k_static_files) {
-		if (uri === k_static_files[i].uri && k_static_files[i].path) {
-			let stat = await File.stat('core/' + k_static_files[i].path);
-			let id = `${stat.mtime}_${stat.size}`;
-
-			if (request.headers['if-none-match'] === '"' + id + '"') {
-				response.writeHead(304, {'Content-Length': '0'});
-				response.end();
-			} else {
-				let data = await File.readFile('core/' + k_static_files[i].path);
-				response.writeHead(
-					200,
-					Object.assign(
-						{
-							'Content-Type': k_static_files[i].type,
-							'Content-Length': data.byteLength,
-							etag: '"' + id + '"',
-						},
-						k_static_files[i].headers || {}
-					)
-				);
-				response.end(data);
-			}
-			return;
-		}
-	}
-
 	if (!uri) {
 		response.writeHead(303, {
 			Location:
@@ -1232,7 +1203,7 @@ async function loadSettings() {
  */
 function sendStats() {
 	let apps = Object.values(gProcesses)
-		.filter((process) => process.app && process.stats)
+		.filter((process) => process.app)
 		.map((process) => process.app);
 	if (apps.length) {
 		let stats = getStats();
@@ -1245,19 +1216,6 @@ function sendStats() {
 	}
 }
 
-/**
- * TODOC
- * @param {*} process
- * @param {*} enabled
- */
-function enableStats(process, enabled) {
-	process.stats = enabled;
-	if (!gStatsTimer) {
-		gStatsTimer = true;
-		sendStats();
-	}
-}
-
 /**
  * TODOC
  */
@@ -1374,7 +1332,6 @@ function storePermission(user, packageOwner, packageName, permission, allow) {
 export {
 	gGlobalSettings as globalSettings,
 	setGlobalSettings,
-	enableStats,
 	invoke,
 	getSessionProcessBlob,
 };

core/index.html

@@ -25,6 +25,17 @@
 			max-height: 100%;
 		"
 	>
+		<noscript>
+			<div class="w3-container">
+				<div class="w3-panel w3-red w3-padding w3-card-4">
+					<h1>TildeFriends requires JavaScript.</h1>
+					<p>
+						It looks like JavaScript is disabled or unsupported. This isn't
+						going to work.
+					</p>
+				</div>
+			</div>
+		</noscript>
 		<tf-navigation></tf-navigation>
 		<div id="content" class="hbox" style="flex: 1 0; overflow: auto">
 			<div

core/tildefriends.svg

@@ -1 +1,88 @@
-<svg width="65" height="65" viewBox="0 0 61 65" fill="none" xmlns="http://www.w3.org/2000/svg"><path style="fill:#0af;stroke-width:.712717;fill-opacity:1" d="M6 0h49a8 8 45 0 1 8 8v49a8 8 135 0 1-8 8H6a8 8 45 0 1-8-8V8a8 8 135 0 1 8-8Z"/><text xml:space="preserve" style="font-style:normal;font-weight:400;font-size:40px;line-height:1.25;font-family:sans-serif;fill:#000;fill-opacity:1;stroke:none" x="-.023" y="47.568"><tspan x="-.023" y="47.568" style="font-style:normal;font-variant:normal;font-weight:400;font-stretch:normal;font-size:40px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal">~</tspan></text><g transform="translate(16.213 5.975) scale(.72923)"><circle cx="36" cy="36" r="23" fill="#fcea2b"/><path fill="#3f3f3f" d="M45.331 38.564c3.963 0 7.178-2.862 7.178-6.389 0-1.765.448-3.53-.852-4.685-1.299-1.156-4.345-1.704-6.326-1.704-2.357 0-5.143.143-6.451 1.704-.894 1.065-.727 3.253-.727 4.685 0 3.527 3.213 6.389 7.178 6.389zM25.738 38.564c3.963 0 7.179-2.862 7.179-6.389 0-1.765.447-3.53-.852-4.685-1.3-1.156-4.345-1.704-6.327-1.704-2.356 0-5.142.143-6.451 1.704-.893 1.065-.727 3.253-.727 4.685 0 3.527 3.213 6.389 7.178 6.389z"/></g><g stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="2" transform="translate(16.213 5.975) scale(.72923)"><circle cx="35.887" cy="36.056" r="23"/><path d="M45.702 44.862c-6.574 3.525-14.045 3.658-19.63 0M18.883 30.464s-.953 8.55 6.86 7.918c2.62-.212 7.817-.65 7.867-8.342.005-.698-.007-1.6-.81-2.63-1.065-1.367-3.572-1.971-9.945-1.422 0 0-3.446-.1-3.972 4.476z"/><path d="m18.953 29.931-.433-3.372 3.833-.527M52.741 30.464s.953 8.55-6.86 7.918c-2.62-.212-7.817-.65-7.868-8.342-.004-.698.008-1.6.811-2.63 1.065-1.367 3.572-1.971 9.945-1.422 0 0 3.446-.1 3.972 4.476z"/><path d="M31.505 26.416s4.124 2.534 8.657 0M33.536 31.318s2.202-3.751 4.536 0M52.664 29.933l.433-3.371-3.833-.528"/><path d="M33.955 30.027s1.795-3.75 3.699 0"/></g></svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="65"
+   height="65"
+   viewBox="0 0 61 65"
+   fill="none"
+   version="1.1"
+   id="svg910"
+   sodipodi:docname="tildefriends.svg"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs914" />
+  <sodipodi:namedview
+     id="namedview912"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="18.369231"
+     inkscape:cx="32.472781"
+     inkscape:cy="32.5"
+     inkscape:window-width="2256"
+     inkscape:window-height="1447"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg910" />
+  <path
+     style="fill:#0af;stroke-width:.712717;fill-opacity:1"
+     d="M6 0h49a8 8 45 0 1 8 8v49a8 8 135 0 1-8 8H6a8 8 45 0 1-8-8V8a8 8 135 0 1 8-8Z"
+     id="path886" />
+  <g
+     aria-label="~"
+     id="text890"
+     style="font-size:40px;line-height:1.25;fill:#000000">
+    <path
+       d="m 1.6762187,36.689095 v -4.003907 q 2.0703125,-2.34375 5.4296875,-2.34375 1.171875,0 2.4609375,0.351563 1.2890623,0.332031 3.6718753,1.347656 1.347656,0.566406 2.011718,0.742188 0.683594,0.175781 1.367188,0.175781 1.269531,0 2.617187,-0.761719 1.367188,-0.761719 2.421875,-1.914062 v 4.140625 q -1.25,1.171875 -2.539062,1.699218 -1.269531,0.527344 -2.871094,0.527344 -1.171875,0 -2.246094,-0.273437 -1.054687,-0.273438 -3.378906,-1.308594 -2.3046873,-1.035156 -3.847656,-1.035156 -1.25,0 -2.3632813,0.546875 -1.09375,0.527343 -2.734375,2.109375 z"
+       style="font-family:Arial;-inkscape-font-specification:'Arial, Normal'"
+       id="path1704" />
+  </g>
+  <g
+     transform="translate(16.213 5.975) scale(.72923)"
+     id="g896">
+    <circle
+       cx="36"
+       cy="36"
+       r="23"
+       fill="#fcea2b"
+       id="circle892" />
+    <path
+       fill="#3f3f3f"
+       d="M45.331 38.564c3.963 0 7.178-2.862 7.178-6.389 0-1.765.448-3.53-.852-4.685-1.299-1.156-4.345-1.704-6.326-1.704-2.357 0-5.143.143-6.451 1.704-.894 1.065-.727 3.253-.727 4.685 0 3.527 3.213 6.389 7.178 6.389zM25.738 38.564c3.963 0 7.179-2.862 7.179-6.389 0-1.765.447-3.53-.852-4.685-1.3-1.156-4.345-1.704-6.327-1.704-2.356 0-5.142.143-6.451 1.704-.893 1.065-.727 3.253-.727 4.685 0 3.527 3.213 6.389 7.178 6.389z"
+       id="path894" />
+  </g>
+  <g
+     stroke="#000"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     stroke-miterlimit="10"
+     stroke-width="2"
+     transform="translate(16.213 5.975) scale(.72923)"
+     id="g908">
+    <circle
+       cx="35.887"
+       cy="36.056"
+       r="23"
+       id="circle898" />
+    <path
+       d="M45.702 44.862c-6.574 3.525-14.045 3.658-19.63 0M18.883 30.464s-.953 8.55 6.86 7.918c2.62-.212 7.817-.65 7.867-8.342.005-.698-.007-1.6-.81-2.63-1.065-1.367-3.572-1.971-9.945-1.422 0 0-3.446-.1-3.972 4.476z"
+       id="path900" />
+    <path
+       d="m18.953 29.931-.433-3.372 3.833-.527M52.741 30.464s.953 8.55-6.86 7.918c-2.62-.212-7.817-.65-7.868-8.342-.004-.698.008-1.6.811-2.63 1.065-1.367 3.572-1.971 9.945-1.422 0 0 3.446-.1 3.972 4.476z"
+       id="path902" />
+    <path
+       d="M31.505 26.416s4.124 2.534 8.657 0M33.536 31.318s2.202-3.751 4.536 0M52.664 29.933l.433-3.371-3.833-.528"
+       id="path904" />
+    <path
+       d="M33.955 30.027s1.795-3.75 3.699 0"
+       id="path906" />
+  </g>
+</svg>

default.nix

@@ -21,14 +21,14 @@
 }:
 pkgs.stdenv.mkDerivation rec {
   pname = "tildefriends";
-  version = "0.0.20";
+  version = "0.0.21";
 
   src = pkgs.fetchFromGitea {
     domain = "dev.tildefriends.net";
     owner = "cory";
     repo = "tildefriends";
     rev = "v${version}";
-    hash = "sha256-q7PQS/OnfPyU74FBsTmuwWn+G8XTJ11ulvTxf1sgUQk=";
+    hash = "sha256-cBj9Hz0qT0Tqm7ivM8HPG9TNwC9iv0lTcE8XCNba8F4=";
     fetchSubmodules = true;
   };
 

deps/codemirror_src/package-lock.json

@@ -19,9 +19,9 @@
       }
     },
     "node_modules/@codemirror/autocomplete": {
-      "version": "6.16.2",
+      "version": "6.17.0",
-      "resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.16.2.tgz",
+      "resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.17.0.tgz",
-      "integrity": "sha512-MjfDrHy0gHKlPWsvSsikhO1+BOh+eBHNgfH1OXs1+DAf30IonQldgMM3kxLDTG9ktE7kDLaA1j/l7KMPA4KNfw==",
+      "integrity": "sha512-fdfj6e6ZxZf8yrkMHUSJJir7OJkHkZKaOZGzLWIYp2PZ3jd+d+UjG8zVPqJF6d3bKxkhvXTPan/UZ1t7Bqm0gA==",
       "dependencies": {
         "@codemirror/language": "^6.0.0",
         "@codemirror/state": "^6.0.0",
@@ -111,9 +111,9 @@
       }
     },
     "node_modules/@codemirror/lint": {
-      "version": "6.8.0",
+      "version": "6.8.1",
-      "resolved": "https://registry.npmjs.org/@codemirror/lint/-/lint-6.8.0.tgz",
+      "resolved": "https://registry.npmjs.org/@codemirror/lint/-/lint-6.8.1.tgz",
-      "integrity": "sha512-lsFofvaw0lnPRJlQylNsC4IRt/1lI4OD/yYslrSGVndOJfStc58v+8p9dgGiD90ktOfL7OhBWns1ZETYgz0EJA==",
+      "integrity": "sha512-IZ0Y7S4/bpaunwggW2jYqwLuHj0QtESf5xcROewY6+lDNwZ/NzvR4t+vpYgg9m7V8UXLPYqG+lu3DF470E5Oxg==",
       "dependencies": {
         "@codemirror/state": "^6.0.0",
         "@codemirror/view": "^6.0.0",
@@ -147,9 +147,9 @@
       }
     },
     "node_modules/@codemirror/view": {
-      "version": "6.28.1",
+      "version": "6.29.1",
-      "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.28.1.tgz",
+      "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.29.1.tgz",
-      "integrity": "sha512-BUWr+zCJpMkA/u69HlJmR+YkV4yPpM81HeMkOMZuwFa8iM5uJdEPKAs1icIRZKkKmy0Ub1x9/G3PQLTXdpBxrQ==",
+      "integrity": "sha512-7r+DlO/QFwPqKp73uq5mmrS4TuLPUVotbNOKYzN3OLP5ScrOVXcm4g13/48b6ZXGhdmzMinzFYqH0vo+qihIkQ==",
       "dependencies": {
         "@codemirror/state": "^6.4.0",
         "style-mod": "^4.1.0",
@@ -199,9 +199,9 @@
       }
     },
     "node_modules/@jridgewell/sourcemap-codec": {
-      "version": "1.4.15",
+      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
-      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==",
+      "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==",
       "dev": true
     },
     "node_modules/@jridgewell/trace-mapping": {
@@ -268,9 +268,9 @@
       }
     },
     "node_modules/@lezer/lr": {
-      "version": "1.4.1",
+      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/@lezer/lr/-/lr-1.4.1.tgz",
+      "resolved": "https://registry.npmjs.org/@lezer/lr/-/lr-1.4.2.tgz",
-      "integrity": "sha512-CHsKq8DMKBf9b3yXPDIU4DbH+ZJd/sJdYOW2llbW/HudP5u0VS6Bfq1hLYfgU7uAYGFIyGGQIsSOXGPEErZiJw==",
+      "integrity": "sha512-pu0K1jCIdnQ12aWNaAVU5bzi7Bd1w54J3ECgANPmYLtQKP0HBj2cE/5coBD66MT10xbtIuUr7tg0Shbsvk0mDA==",
       "dependencies": {
         "@lezer/common": "^1.0.0"
       }
@@ -343,9 +343,9 @@
       }
     },
     "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.18.0",
+      "version": "4.19.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.18.0.tgz",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.19.1.tgz",
-      "integrity": "sha512-Tya6xypR10giZV1XzxmH5wr25VcZSncG0pZIjfePT0OVBvqNEurzValetGNarVrGiq66EBVAFn15iYX4w6FKgQ==",
+      "integrity": "sha512-XzqSg714++M+FXhHfXpS1tDnNZNpgxxuGZWlRG/jSj+VEPmZ0yg6jV4E0AL3uyBKxO8mO3xtOsP5mQ+XLfrlww==",
       "cpu": [
         "arm"
       ],
@@ -355,9 +355,9 @@
       ]
     },
     "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.18.0",
+      "version": "4.19.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.18.0.tgz",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.19.1.tgz",
-      "integrity": "sha512-avCea0RAP03lTsDhEyfy+hpfr85KfyTctMADqHVhLAF3MlIkq83CP8UfAHUssgXTYd+6er6PaAhx/QGv4L1EiA==",
+      "integrity": "sha512-thFUbkHteM20BGShD6P08aungq4irbIZKUNbG70LN8RkO7YztcGPiKTTGZS7Kw+x5h8hOXs0i4OaHwFxlpQN6A==",
       "cpu": [
         "arm64"
       ],
@@ -367,9 +367,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.18.0",
+      "version": "4.19.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.18.0.tgz",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.19.1.tgz",
-      "integrity": "sha512-IWfdwU7KDSm07Ty0PuA/W2JYoZ4iTj3TUQjkVsO/6U+4I1jN5lcR71ZEvRh52sDOERdnNhhHU57UITXz5jC1/w==",
+      "integrity": "sha512-8o6eqeFZzVLia2hKPUZk4jdE3zW7LCcZr+MD18tXkgBBid3lssGVAYuox8x6YHoEPDdDa9ixTaStcmx88lio5Q==",
       "cpu": [
         "arm64"
       ],
@@ -379,9 +379,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.18.0",
+      "version": "4.19.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.18.0.tgz",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.19.1.tgz",
-      "integrity": "sha512-n2LMsUz7Ynu7DoQrSQkBf8iNrjOGyPLrdSg802vk6XT3FtsgX6JbE8IHRvposskFm9SNxzkLYGSq9QdpLYpRNA==",
+      "integrity": "sha512-4T42heKsnbjkn7ovYiAdDVRRWZLU9Kmhdt6HafZxFcUdpjlBlxj4wDrt1yFWLk7G4+E+8p2C9tcmSu0KA6auGA==",
       "cpu": [
         "x64"
       ],
@@ -391,9 +391,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.18.0",
+      "version": "4.19.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.18.0.tgz",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.19.1.tgz",
-      "integrity": "sha512-C/zbRYRXFjWvz9Z4haRxcTdnkPt1BtCkz+7RtBSuNmKzMzp3ZxdM28Mpccn6pt28/UWUCTXa+b0Mx1k3g6NOMA==",
+      "integrity": "sha512-MXg1xp+e5GhZ3Vit1gGEyoC+dyQUBy2JgVQ+3hUrD9wZMkUw/ywgkpK7oZgnB6kPpGrxJ41clkPPnsknuD6M2Q==",
       "cpu": [
         "arm"
       ],
@@ -403,9 +403,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-      "version": "4.18.0",
+      "version": "4.19.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.18.0.tgz",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.19.1.tgz",
-      "integrity": "sha512-l3m9ewPgjQSXrUMHg93vt0hYCGnrMOcUpTz6FLtbwljo2HluS4zTXFy2571YQbisTnfTKPZ01u/ukJdQTLGh9A==",
+      "integrity": "sha512-DZNLwIY4ftPSRVkJEaxYkq7u2zel7aah57HESuNkUnz+3bZHxwkCUkrfS2IWC1sxK6F2QNIR0Qr/YXw7nkF3Pw==",
       "cpu": [
         "arm"
       ],
@@ -415,9 +415,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.18.0",
+      "version": "4.19.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.18.0.tgz",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.19.1.tgz",
-      "integrity": "sha512-rJ5D47d8WD7J+7STKdCUAgmQk49xuFrRi9pZkWoRD1UeSMakbcepWXPF8ycChBoAqs1pb2wzvbY6Q33WmN2ftw==",
+      "integrity": "sha512-C7evongnjyxdngSDRRSQv5GvyfISizgtk9RM+z2biV5kY6S/NF/wta7K+DanmktC5DkuaJQgoKGf7KUDmA7RUw==",
       "cpu": [
         "arm64"
       ],
@@ -427,9 +427,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.18.0",
+      "version": "4.19.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.18.0.tgz",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.19.1.tgz",
-      "integrity": "sha512-be6Yx37b24ZwxQ+wOQXXLZqpq4jTckJhtGlWGZs68TgdKXJgw54lUUoFYrg6Zs/kjzAQwEwYbp8JxZVzZLRepQ==",
+      "integrity": "sha512-89tFWqxfxLLHkAthAcrTs9etAoBFRduNfWdl2xUs/yLV+7XDrJ5yuXMHptNqf1Zw0UCA3cAutkAiAokYCkaPtw==",
       "cpu": [
         "arm64"
       ],
@@ -439,9 +439,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-      "version": "4.18.0",
+      "version": "4.19.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.18.0.tgz",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.19.1.tgz",
-      "integrity": "sha512-hNVMQK+qrA9Todu9+wqrXOHxFiD5YmdEi3paj6vP02Kx1hjd2LLYR2eaN7DsEshg09+9uzWi2W18MJDlG0cxJA==",
+      "integrity": "sha512-PromGeV50sq+YfaisG8W3fd+Cl6mnOOiNv2qKKqKCpiiEke2KiKVyDqG/Mb9GWKbYMHj5a01fq/qlUR28PFhCQ==",
       "cpu": [
         "ppc64"
       ],
@@ -451,9 +451,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.18.0",
+      "version": "4.19.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.18.0.tgz",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.19.1.tgz",
-      "integrity": "sha512-ROCM7i+m1NfdrsmvwSzoxp9HFtmKGHEqu5NNDiZWQtXLA8S5HBCkVvKAxJ8U+CVctHwV2Gb5VUaK7UAkzhDjlg==",
+      "integrity": "sha512-/1BmHYh+iz0cNCP0oHCuF8CSiNj0JOGf0jRlSo3L/FAyZyG2rGBuKpkZVH9YF+x58r1jgWxvm1aRg3DHrLDt6A==",
       "cpu": [
         "riscv64"
       ],
@@ -463,9 +463,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.18.0",
+      "version": "4.19.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.18.0.tgz",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.19.1.tgz",
-      "integrity": "sha512-0UyyRHyDN42QL+NbqevXIIUnKA47A+45WyasO+y2bGJ1mhQrfrtXUpTxCOrfxCR4esV3/RLYyucGVPiUsO8xjg==",
+      "integrity": "sha512-0cYP5rGkQWRZKy9/HtsWVStLXzCF3cCBTRI+qRL8Z+wkYlqN7zrSYm6FuY5Kd5ysS5aH0q5lVgb/WbG4jqXN1Q==",
       "cpu": [
         "s390x"
       ],
@@ -475,9 +475,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.18.0",
+      "version": "4.19.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.18.0.tgz",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.19.1.tgz",
-      "integrity": "sha512-xuglR2rBVHA5UsI8h8UbX4VJ470PtGCf5Vpswh7p2ukaqBGFTnsfzxUBetoWBWymHMxbIG0Cmx7Y9qDZzr648w==",
+      "integrity": "sha512-XUXeI9eM8rMP8aGvii/aOOiMvTs7xlCosq9xCjcqI9+5hBxtjDpD+7Abm1ZhVIFE1J2h2VIg0t2DX/gjespC2Q==",
       "cpu": [
         "x64"
       ],
@@ -487,9 +487,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.18.0",
+      "version": "4.19.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.18.0.tgz",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.19.1.tgz",
-      "integrity": "sha512-LKaqQL9osY/ir2geuLVvRRs+utWUNilzdE90TpyoX0eNqPzWjRm14oMEE+YLve4k/NAqCdPkGYDaDF5Sw+xBfg==",
+      "integrity": "sha512-V7cBw/cKXMfEVhpSvVZhC+iGifD6U1zJ4tbibjjN+Xi3blSXaj/rJynAkCFFQfoG6VZrAiP7uGVzL440Q6Me2Q==",
       "cpu": [
         "x64"
       ],
@@ -499,9 +499,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.18.0",
+      "version": "4.19.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.18.0.tgz",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.19.1.tgz",
-      "integrity": "sha512-7J6TkZQFGo9qBKH0pk2cEVSRhJbL6MtfWxth7Y5YmZs57Pi+4x6c2dStAUvaQkHQLnEQv1jzBUW43GvZW8OFqA==",
+      "integrity": "sha512-88brja2vldW/76jWATlBqHEoGjJLRnP0WOEKAUbMcXaAZnemNhlAHSyj4jIwMoP2T750LE9lblvD4e2jXleZsA==",
       "cpu": [
         "arm64"
       ],
@@ -511,9 +511,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.18.0",
+      "version": "4.19.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.18.0.tgz",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.19.1.tgz",
-      "integrity": "sha512-Txjh+IxBPbkUB9+SXZMpv+b/vnTEtFyfWZgJ6iyCmt2tdx0OF5WhFowLmnh8ENGNpfUlUZkdI//4IEmhwPieNg==",
+      "integrity": "sha512-LdxxcqRVSXi6k6JUrTah1rHuaupoeuiv38du8Mt4r4IPer3kwlTo+RuvfE8KzZ/tL6BhaPlzJ3835i6CxrFIRQ==",
       "cpu": [
         "ia32"
       ],
@@ -523,9 +523,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.18.0",
+      "version": "4.19.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.18.0.tgz",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.19.1.tgz",
-      "integrity": "sha512-UOo5FdvOL0+eIVTgS4tIdbW+TtnBLWg1YBCcU2KWM7nuNwRz9bksDX1bekJJCpu25N1DVWaCwnT39dVQxzqS8g==",
+      "integrity": "sha512-2bIrL28PcK3YCqD9anGxDxamxdiJAxA+l7fWIwM5o8UqNy1t3d1NdAweO2XhA0KTDJ5aH1FsuiT5+7VhtHliXg==",
       "cpu": [
         "x64"
       ],
@@ -545,9 +545,9 @@
       "integrity": "sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q=="
     },
     "node_modules/acorn": {
-      "version": "8.12.0",
+      "version": "8.12.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.0.tgz",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz",
-      "integrity": "sha512-RTvkC4w+KNXrM39/lWCUaG0IbRkWdCv7W/IOW9oU6SawyxulvkQy5HQPVTKxEjczcUvapcrw3cFx/60VN/NRNw==",
+      "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==",
       "dev": true,
       "bin": {
         "acorn": "bin/acorn"
@@ -658,11 +658,14 @@
       }
     },
     "node_modules/is-core-module": {
-      "version": "2.13.1",
+      "version": "2.15.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.0.tgz",
-      "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==",
+      "integrity": "sha512-Dd+Lb2/zvk9SKy1TGCt1wFJFo/MWBPMX5x7KcvLajWTGuomczdQX61PvY5yK6SVACwpoexWo81IfFyoKY2QnTA==",
       "dependencies": {
-        "hasown": "^2.0.0"
+        "hasown": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -715,9 +718,9 @@
       }
     },
     "node_modules/rollup": {
-      "version": "4.18.0",
+      "version": "4.19.1",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.18.0.tgz",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.19.1.tgz",
-      "integrity": "sha512-QmJz14PX3rzbJCN1SG4Xe/bAAX2a6NpCP8ab2vfu2GiUr8AQcr2nCV/oEO3yneFarB67zk8ShlIyWb2LGTb3Sg==",
+      "integrity": "sha512-K5vziVlg7hTpYfFBI+91zHBEMo6jafYXpkMlqZjg7/zhIG9iHqazBf4xz9AVdjS9BruRn280ROqLI7G3OFRIlw==",
       "dependencies": {
         "@types/estree": "1.0.5"
       },
@@ -729,22 +732,22 @@
         "npm": ">=8.0.0"
       },
       "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.18.0",
+        "@rollup/rollup-android-arm-eabi": "4.19.1",
-        "@rollup/rollup-android-arm64": "4.18.0",
+        "@rollup/rollup-android-arm64": "4.19.1",
-        "@rollup/rollup-darwin-arm64": "4.18.0",
+        "@rollup/rollup-darwin-arm64": "4.19.1",
-        "@rollup/rollup-darwin-x64": "4.18.0",
+        "@rollup/rollup-darwin-x64": "4.19.1",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.18.0",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.19.1",
-        "@rollup/rollup-linux-arm-musleabihf": "4.18.0",
+        "@rollup/rollup-linux-arm-musleabihf": "4.19.1",
-        "@rollup/rollup-linux-arm64-gnu": "4.18.0",
+        "@rollup/rollup-linux-arm64-gnu": "4.19.1",
-        "@rollup/rollup-linux-arm64-musl": "4.18.0",
+        "@rollup/rollup-linux-arm64-musl": "4.19.1",
-        "@rollup/rollup-linux-powerpc64le-gnu": "4.18.0",
+        "@rollup/rollup-linux-powerpc64le-gnu": "4.19.1",
-        "@rollup/rollup-linux-riscv64-gnu": "4.18.0",
+        "@rollup/rollup-linux-riscv64-gnu": "4.19.1",
-        "@rollup/rollup-linux-s390x-gnu": "4.18.0",
+        "@rollup/rollup-linux-s390x-gnu": "4.19.1",
-        "@rollup/rollup-linux-x64-gnu": "4.18.0",
+        "@rollup/rollup-linux-x64-gnu": "4.19.1",
-        "@rollup/rollup-linux-x64-musl": "4.18.0",
+        "@rollup/rollup-linux-x64-musl": "4.19.1",
-        "@rollup/rollup-win32-arm64-msvc": "4.18.0",
+        "@rollup/rollup-win32-arm64-msvc": "4.19.1",
-        "@rollup/rollup-win32-ia32-msvc": "4.18.0",
+        "@rollup/rollup-win32-ia32-msvc": "4.19.1",
-        "@rollup/rollup-win32-x64-msvc": "4.18.0",
+        "@rollup/rollup-win32-x64-msvc": "4.19.1",
         "fsevents": "~2.3.2"
       }
     },
@@ -819,9 +822,9 @@
       }
     },
     "node_modules/terser": {
-      "version": "5.31.1",
+      "version": "5.31.3",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.31.1.tgz",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.31.3.tgz",
-      "integrity": "sha512-37upzU1+viGvuFtBo9NPufCb9dwM0+l9hMxYyWfBA+fbwrPqNJAhbZ6W47bBFnZHKHTUBnMvi87434qq+qnxOg==",
+      "integrity": "sha512-pAfYn3NIZLyZpa83ZKigvj6Rn9c/vd5KfYGX7cN1mnzqgDcxWvrU5ZtAfIKhEXz9nRecw4z3LXkjaq96/qZqAA==",
       "dev": true,
       "dependencies": {
         "@jridgewell/source-map": "^0.3.3",

metadata/en-US/changelogs/24.txt

@@ -0,0 +1,7 @@
+ * Reworked Android to launch its sandbox processes the prescribed way so that
+   a Google Play-shippable android .aab is possible.
+ * Reworked the build to generate what F-Droid wants, too.
+ * Updated libbacktrace.
+ * Updated CodeMirror.
+ * Updated Android NDK.
+ * Enabled LTO for smaller code sizes.

metadata/en-US/full_description.txt

@@ -0,0 +1,3 @@
+Tilde Friends is both a peer-to-peer social network client, participating in
+Secure Scuttlebutt, as well as a platform for writing and running web
+applications.

metadata/en-US/short_description.txt

@@ -0,0 +1 @@
+A tool for making and sharing

metadata/en-US/title.txt

@@ -0,0 +1 @@
+Tilde Friends

src/android/AndroidManifest.xml

@@ -1,15 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	package="com.unprompted.tildefriends"
-	android:versionCode="21"
+	android:versionCode="25"
-	android:versionName="0.0.21-wip">
+	android:versionName="0.0.21.1">
-	<uses-sdk android:minSdkVersion="24" android:targetSdkVersion="34"/>
 	<uses-permission android:name="android.permission.INTERNET"/>
 	<application
 		android:label="Tilde Friends"
-		android:usesCleartextTraffic="true"
+		android:usesCleartextTraffic="true">
-		android:debuggable="true"
-		android:extractNativeLibs="true">
 		<meta-data android:name="android.max_aspect" android:value="2.1"/>
 		<activity
 			android:name=".TildeFriendsActivity"
@@ -21,5 +18,10 @@
 				<category android:name="android.intent.category.LAUNCHER"/>
 			</intent-filter>
 		</activity>
+		<service
+			android:name=".TildeFriendsSandboxService"
+			android:exported="false"
+			android:isolatedProcess="true"
+			android:process=":sandbox"/>
 	</application>
 </manifest>

src/android/BundleConfig.json

@@ -0,0 +1,5 @@
+{
+	"optimizations" : {
+		"uncompress_native_libraries" : {}
+	}
+}

src/android/build.xml

@@ -0,0 +1,6 @@
+<project>
+	<target name="clean"></target>
+	<target name="release">
+		<echo>Creating ../../../out/apk/TildeFriends-release.fdroid.unsigned.apk for release.</echo>
+	</target>
+</project>

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

@@ -3,15 +3,18 @@ package com.unprompted.tildefriends;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.DownloadManager;
+import android.content.ComponentName;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.ServiceConnection;
 import android.net.Uri;
 import android.os.Bundle;
-import android.os.CountDownTimer;
 import android.os.Environment;
+import android.os.IBinder;
+import android.os.Parcel;
+import android.os.ParcelFileDescriptor;
+import android.os.RemoteException;
 import android.os.StrictMode;
-import android.os.SystemClock;
-import android.os.strictmode.Violation;
 import android.util.Base64;
 import android.util.Log;
 import android.view.KeyEvent;
@@ -29,19 +32,13 @@ import android.webkit.WebChromeClient;
 import android.webkit.WebResourceRequest;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
-import android.widget.Button;
 import android.widget.TextView;
 import android.widget.Toast;
-import java.io.BufferedInputStream;
 import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileOutputStream;
-import java.io.OutputStream;
 import java.io.FileReader;
-import java.io.InputStream;
+import java.io.OutputStream;
-import java.lang.Process;
-import java.lang.Thread;
 import java.nio.file.FileSystems;
 import java.nio.file.Paths;
 import java.nio.file.StandardWatchEventKinds;
@@ -51,17 +48,30 @@ import java.nio.file.WatchService;
 import java.util.concurrent.TimeUnit;
 
 public class TildeFriendsActivity extends Activity {
+	static TildeFriendsActivity s_activity;
 	TildeFriendsWebView web_view;
 	String base_url;
-	Process process;
+	String port_file_path;
 	Thread thread;
+	Thread server_thread;
+	ServiceConnection service_connection;
 
 	private ValueCallback<Uri[]> upload_message;
 	private final static int FILECHOOSER_RESULT = 1;
 	private float touch_down_y;
 
+	static {
+		Log.w("tildefriends", "Calling system.loadLibrary().");
+		System.loadLibrary("tildefriends");
+		Log.w("tildefriends", "system.loadLibrary() completed.");
+	}
+
+	public static native int tf_server_main(String files_dir, String apk_path, String out_port_file_path);
+	public static native int tf_sandbox_main(int pipe_fd);
+
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
+		s_activity = this;
 		StrictMode.setVmPolicy(new StrictMode.VmPolicy.Builder()
 			.detectLeakedClosableObjects()
 			.penaltyLog()
@@ -76,7 +86,7 @@ public class TildeFriendsActivity extends Activity {
 		Log.w("tildefriends", String.format("getPackageResourcePath() is %s", getPackageResourcePath().toString()));
 		Log.w("tildefriends", String.format("nativeLibraryDir is %s", getApplicationInfo().nativeLibraryDir));
 
-		String port_file_path = getFilesDir().toString() + "/port.txt";
+		port_file_path = getFilesDir().toString() + "/port.txt";
 		new File(port_file_path).delete();
 		base_url = "http://127.0.0.1:12345/";
 
@@ -134,17 +144,15 @@ public class TildeFriendsActivity extends Activity {
 		thread.start();
 
 		set_status("Starting server...");
-		String exe = getApplicationInfo().nativeLibraryDir + "/tildefriends.so";
+		server_thread = new Thread(new Runnable() {
-		ProcessBuilder builder = new ProcessBuilder(exe, "run", "-z", getPackageResourcePath().toString(), "-a", "out_http_port_file=" + port_file_path, "-p", "0");
+			@Override
-		Log.w("tildefriends", "files = " + getFilesDir().toString());
+			public void run() {
-		Log.w("tildefriends", "exe = " + exe);
+				Log.w("tildefriends", "Calling tf_server_main.");
-		builder.directory(getFilesDir());
+				int result = tf_server_main(getFilesDir().toString(), getPackageResourcePath().toString(), port_file_path);
-		builder.inheritIO();
+				Log.w("tildefriends", "tf_server_main returned " + result + ".");
-		try {
+			}
-			process = builder.start();
+		});
-		} catch (java.io.IOException e) {
+		server_thread.start();
-			Log.w("tildefriends", "IOException starting process: " + e.toString());
-		}
 
 		web_view.getSettings().setJavaScriptEnabled(true);
 		web_view.getSettings().setDatabaseEnabled(true);
@@ -266,13 +274,8 @@ public class TildeFriendsActivity extends Activity {
 	@Override
 	protected void onDestroy()
 	{
-		if (process != null) {
-			Log.w("tildefriends", "Killing process.");
-			process.destroyForcibly();
-			Log.w("tildefriends", "Process killed.");
-			process = null;
-		}
 		super.onDestroy();
+		s_activity = null;
 	}
 
 	@Override
@@ -374,4 +377,49 @@ public class TildeFriendsActivity extends Activity {
 		web_view.setVisibility(View.VISIBLE);
 		text_view.setVisibility(View.GONE);
 	}
+
+	public static void start_sandbox(int pipe_fd) {
+		Log.w("tildefriends", "starting service with fd: " + pipe_fd);
+		Intent intent = new Intent(s_activity, TildeFriendsSandboxService.class);
+		s_activity.service_connection = new ServiceConnection() {
+			@Override
+			public void onBindingDied(ComponentName name) {
+				Log.w("tildefriends", "onBindingDied");
+			}
+
+			@Override
+			public void onNullBinding(ComponentName name) {
+				Log.w("tildefriends", "onNullBinding");
+			}
+
+			@Override
+			public void onServiceConnected(ComponentName name, IBinder binder) {
+				Log.w("tildefriends", "onServiceConnected");
+				Parcel data = Parcel.obtain();
+				ParcelFileDescriptor pfd = ParcelFileDescriptor.adoptFd(pipe_fd);
+				data.writeParcelable(pfd, 0);
+				try {
+					binder.transact(TildeFriendsSandboxService.START_CALL,  data, null, IBinder.FLAG_ONEWAY);
+				} catch (RemoteException e) {
+					Log.w("tildefriends", "RemoteException");
+				} finally {
+					data.recycle();
+				}
+			}
+
+			@Override
+			public void onServiceDisconnected(ComponentName name) {
+				Log.w("tildefriends", "onServiceDisconnected");
+			}
+		};
+		s_activity.bindService(intent, s_activity.service_connection, BIND_AUTO_CREATE);
+	}
+
+	public static void stop_sandbox() {
+		Log.w("tildefriends", "stop_sandbox");
+		if (s_activity.service_connection != null) {
+			s_activity.unbindService(s_activity.service_connection);
+			s_activity.service_connection = null;
+		}
+	}
 }

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

@@ -0,0 +1,59 @@
+package com.unprompted.tildefriends;
+
+import android.app.Service;
+import android.content.Intent;
+import android.os.Binder;
+import android.os.IBinder;
+import android.os.Parcel;
+import android.os.ParcelFileDescriptor;
+import android.util.Log;
+
+public class TildeFriendsSandboxService extends Service {
+	public static final int START_CALL = IBinder.FIRST_CALL_TRANSACTION;
+
+	Thread thread;
+
+	public int onStartCommand(Intent intent, int flags, int start_id) {
+		Log.w("tildefriends", "TildeFriendsSandboxService: onStartCommand");
+		return super.onStartCommand(intent, flags, start_id);
+	}
+
+	public void onDestroy() {
+		Log.w("tildefriends", "TildeFriendsSandboxService: onDestroy");
+		super.onDestroy();
+	}
+
+	private void start_thread(int pipe_fd) {
+		thread = new Thread(new Runnable() {
+			@Override
+			public void run() {
+				Log.w("tildefriends", "Calling tf_sandbox_main.");
+				int result = TildeFriendsActivity.tf_sandbox_main(pipe_fd);
+				Log.w("tildefriends", "tf_sandbox_main returned " + result + ".");
+			}
+		});
+		thread.start();
+	}
+
+	@Override
+	public IBinder onBind(Intent intent) {
+		return new Binder() {
+			@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);
+					if (pfd != null) {
+						Log.w("tildefriends", "fd is " + pfd.getFd());
+						start_thread(pfd.detachFd());
+						try {
+							pfd.close();
+						} catch (java.io.IOException e) {
+						}
+					}
+					return true;
+				}
+				return false;
+			}
+		};
+	}
+}

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

@@ -2,7 +2,6 @@ package com.unprompted.tildefriends;
 
 import android.content.Context;
 import android.util.AttributeSet;
-import android.util.Log;
 
 public class TildeFriendsWebView extends android.webkit.WebView {
 	boolean overscrolledY = false;

src/android/res/drawable/icon.xml

@@ -1,78 +1,55 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72dp"
+    android:width="65dp"
-    android:height="72dp"
+    android:height="65dp"
-    android:viewportWidth="72"
+    android:viewportWidth="61"
-    android:viewportHeight="72">
+    android:viewportHeight="65">
   <path
-      android:pathData="M36,36m-23,0a23,23 0,1 1,46 0a23,23 0,1 1,-46 0"
+      android:pathData="M6,0h49a8,8 45,0 1,8 8v49a8,8 135,0 1,-8 8H6a8,8 45,0 1,-8 -8V8a8,8 135,0 1,8 -8Z"
-      android:fillColor="#FCEA2B"/>
+      android:strokeWidth=".712717"
+      android:fillColor="#0af"
+      android:fillAlpha="1"/>
   <path
-      android:pathData="M45.331,38.564c3.963,0 7.178,-2.862 7.178,-6.389c0,-1.765 0.447,-3.529 -0.852,-4.685s-4.345,-1.704 -6.326,-1.704c-2.357,0 -5.143,0.143 -6.451,1.704c-0.893,1.065 -0.727,3.253 -0.727,4.685C38.153,35.702 41.366,38.564 45.331,38.564z"
+      android:pathData="m1.6762,36.6891v-4.0039q2.0703,-2.3438 5.4297,-2.3438 1.1719,0 2.4609,0.3516 1.2891,0.332 3.6719,1.3477 1.3477,0.5664 2.0117,0.7422 0.6836,0.1758 1.3672,0.1758 1.2695,0 2.6172,-0.7617 1.3672,-0.7617 2.4219,-1.9141v4.1406q-1.25,1.1719 -2.5391,1.6992 -1.2695,0.5273 -2.8711,0.5273 -1.1719,0 -2.2461,-0.2734 -1.0547,-0.2734 -3.3789,-1.3086 -2.3047,-1.0352 -3.8477,-1.0352 -1.25,0 -2.3633,0.5469 -1.0938,0.5273 -2.7344,2.1094z"
-      android:fillColor="#3F3F3F"/>
+      android:fillColor="#000000"/>
   <path
-      android:pathData="M25.738,38.564c3.963,0 7.178,-2.862 7.178,-6.389c0,-1.765 0.447,-3.529 -0.852,-4.685s-4.345,-1.704 -6.326,-1.704c-2.357,0 -5.143,0.143 -6.451,1.704c-0.893,1.065 -0.727,3.253 -0.727,4.685C18.56,35.702 21.773,38.564 25.738,38.564z"
+      android:pathData="M42.4653,32.2273m-16.7723,0a16.7723,16.7723 0,1 1,33.5446 0a16.7723,16.7723 0,1 1,-33.5446 0"
-      android:fillColor="#3F3F3F"/>
+      android:fillColor="#fcea2b"/>
   <path
-      android:pathData="M35.887,36.056m-23,0a23,23 0,1 1,46 0a23,23 0,1 1,-46 0"
+      android:pathData="M49.2697,34.097c2.8899,0 5.2344,-2.0871 5.2344,-4.6591 0,-1.2871 0.3267,-2.5742 -0.6213,-3.4164 -0.9473,-0.843 -3.1685,-1.2426 -4.6131,-1.2426 -1.7188,0 -3.7504,0.1043 -4.7043,1.2426 -0.6519,0.7766 -0.5302,2.3722 -0.5302,3.4164 0,2.572 2.343,4.6591 5.2344,4.6591zM34.9819,34.097c2.8899,0 5.2351,-2.0871 5.2351,-4.6591 0,-1.2871 0.326,-2.5742 -0.6213,-3.4164 -0.948,-0.843 -3.1685,-1.2426 -4.6138,-1.2426 -1.7181,0 -3.7497,0.1043 -4.7043,1.2426 -0.6512,0.7766 -0.5302,2.3722 -0.5302,3.4164 0,2.572 2.343,4.6591 5.2344,4.6591z"
+      android:fillColor="#3f3f3f"/>
+  <path
+      android:pathData="M42.3829,32.2681m-16.7723,0a16.7723,16.7723 0,1 1,33.5446 0a16.7723,16.7723 0,1 1,-33.5446 0"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#000000"
+      android:strokeColor="#000"
       android:strokeLineCap="round"/>
   <path
-      android:pathData="M45.702,44.862c-6.574,3.525 -14.045,3.658 -19.629,0"
+      android:pathData="M49.5403,38.6897c-4.794,2.5705 -10.242,2.6675 -14.3148,0M29.983,28.1903s-0.695,6.2349 5.0025,5.774c1.9106,-0.1546 5.7004,-0.474 5.7369,-6.0832 0.0036,-0.509 -0.0051,-1.1668 -0.5907,-1.9179 -0.7766,-0.9969 -2.6048,-1.4373 -7.2522,-1.037 0,0 -2.5129,-0.0729 -2.8965,3.264z"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#000000"
+      android:strokeColor="#000"
       android:strokeLineCap="round"/>
   <path
-      android:pathData="M18.883,30.464c0,0 -0.953,8.551 6.861,7.918c2.62,-0.212 7.816,-0.651 7.867,-8.343c0.005,-0.698 -0.008,-1.599 -0.811,-2.63c-1.065,-1.367 -3.572,-1.971 -9.945,-1.422C22.855,25.988 19.409,25.889 18.883,30.464z"
+      android:pathData="m30.0341,27.8016 l-0.3158,-2.459 2.7951,-0.3843M54.6733,28.1903s0.695,6.2349 -5.0025,5.774c-1.9106,-0.1546 -5.7004,-0.474 -5.7376,-6.0832 -0.0029,-0.509 0.0058,-1.1668 0.5914,-1.9179 0.7766,-0.9969 2.6048,-1.4373 7.2522,-1.037 0,0 2.5129,-0.0729 2.8965,3.264z"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#000000"
+      android:strokeColor="#000"
       android:strokeLineCap="round"/>
   <path
-      android:pathData="M18.953,29.931l-0.433,-3.371l3.833,-0.528"
+      android:pathData="M39.1874,25.2383s3.0073,1.8479 6.3129,0M40.6685,28.813s1.6058,-2.7353 3.3078,0M54.6172,27.803l0.3158,-2.4582 -2.7951,-0.385"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#000000"
+      android:strokeColor="#000"
       android:strokeLineCap="round"/>
   <path
-      android:pathData="M52.741,30.464c0,0 0.953,8.551 -6.861,7.918c-2.62,-0.212 -7.816,-0.651 -7.867,-8.343c-0.005,-0.698 0.008,-1.599 0.811,-2.63c1.065,-1.367 3.572,-1.971 9.945,-1.422C48.769,25.988 52.215,25.889 52.741,30.464z"
+      android:pathData="M40.974,27.8716s1.309,-2.7346 2.6974,0"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#000000"
+      android:strokeColor="#000"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M31.505,26.416c0,0 4.124,2.534 8.657,0"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="#000000"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M33.536,31.318c0,0 2.202,-3.751 4.536,0"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="#000000"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M52.664,29.933l0.433,-3.371l-3.833,-0.528"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="#000000"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M33.955,30.027c0,0 1.795,-3.751 3.699,0"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="#000000"
       android:strokeLineCap="round"/>
 </vector>

src/httpd.js.c

@@ -905,14 +905,23 @@ static void _httpd_endpoint_static(tf_http_request_t* request)
 	const char* file_path = NULL;
 	for (int i = 0; i < tf_countof(k_map) && !after; i++)
 	{
-		after = _after(request->path, k_map[i][0]);
+		const char* next_after = _after(request->path, k_map[i][0]);
-		file_path = k_map[i][1];
+		if (next_after)
-		is_core = is_core || (after && i == 0);
+		{
+			after = next_after;
+			file_path = k_map[i][1];
+			is_core = after && i == 0;
+		}
 	}
 
-	if (strcmp(request->path, "/speedscope/") == 0)
+	if ((!after || !*after) && request->path[strlen(request->path) - 1] == '/')
 	{
 		after = "index.html";
+		if (!file_path)
+		{
+			file_path = "core/";
+			is_core = true;
+		}
 	}
 
 	if (!after || strstr(after, ".."))
@@ -1668,6 +1677,7 @@ void tf_httpd_register(JSContext* context)
 	tf_http_add_handler(http, "/speedscope/*", _httpd_endpoint_static, NULL, task);
 	tf_http_add_handler(http, "/static/*", _httpd_endpoint_static, NULL, task);
 	tf_http_add_handler(http, "/.well-known/*", _httpd_endpoint_static, NULL, task);
+	tf_http_add_handler(http, "/~*/*/", _httpd_endpoint_static, NULL, task);
 
 	tf_http_add_handler(http, "/robots.txt", _httpd_endpoint_robots_txt, NULL, NULL);
 	tf_http_add_handler(http, "/debug", _httpd_endpoint_debug, NULL, task);

src/main.c

@@ -34,6 +34,10 @@
 #include <unistd.h>
 #endif
 
+#if defined(__ANDROID__)
+#include "jni.h"
+#endif
+
 #if !defined(_countof)
 #define _countof(a) ((int)(sizeof((a)) / sizeof(*(a))))
 #endif
@@ -603,14 +607,16 @@ static int _tf_command_run(const char* file, int argc, char* argv[])
 static int _tf_command_sandbox(const char* file, int argc, char* argv[])
 {
 	bool show_usage = false;
+	int fd = STDIN_FILENO;
 
 	while (!show_usage)
 	{
 		static const struct option k_options[] = {
+			{ "fd", required_argument, NULL, 'f' },
 			{ "help", no_argument, NULL, 'h' },
 			{ 0 },
 		};
-		int c = getopt_long(argc, argv, "h", k_options, NULL);
+		int c = getopt_long(argc, argv, "f:h", k_options, NULL);
 		if (c == -1)
 		{
 			break;
@@ -622,6 +628,9 @@ static int _tf_command_sandbox(const char* file, int argc, char* argv[])
 		default:
 			show_usage = true;
 			break;
+		case 'f':
+			fd = atoi(optarg);
+			break;
 		}
 	}
 
@@ -630,6 +639,7 @@ static int _tf_command_sandbox(const char* file, int argc, char* argv[])
 		tf_printf("\nUsage: %s sandbox [options]\n\n", file);
 		tf_printf("options:\n");
 		tf_printf("  -h, --help    Show this usage information.\n");
+		tf_printf("  -f, --fd      File descriptor with which to communicate with parent process.\n");
 		return EXIT_FAILURE;
 	}
 
@@ -637,7 +647,7 @@ static int _tf_command_sandbox(const char* file, int argc, char* argv[])
 	prctl(PR_SET_PDEATHSIG, SIGHUP);
 #endif
 	tf_task_t* task = tf_task_create();
-	tf_task_configure_from_fd(task, STDIN_FILENO);
+	tf_task_configure_from_fd(task, fd);
 	_shed_privileges();
 	/* The caller will trigger tf_task_activate with a message. */
 	tf_task_run(task);
@@ -685,10 +695,6 @@ static void _startup(int argc, char* argv[])
 		}
 	}
 
-#if defined(__ANDROID__)
-	setenv("UV_USE_IO_URING", "0", 1);
-#endif
-
 	tf_mem_startup(tracking);
 	g_backtrace_state = backtrace_create_state(argv[0], 0, _backtrace_error, NULL);
 
@@ -716,7 +722,7 @@ static void _startup(int argc, char* argv[])
 	{
 		if (
 #if !defined(_WIN32)
-			signal(SIGSYS, _error_handler) == SIG_ERR ||
+			signal(SIGSYS, _error_handler) == SIG_ERR || signal(SIGABRT, _error_handler) == SIG_ERR ||
 #endif
 			signal(SIGSEGV, _error_handler) == SIG_ERR)
 		{
@@ -726,23 +732,137 @@ static void _startup(int argc, char* argv[])
 }
 
 #if defined(__ANDROID__)
+static JNIEnv* s_jni_env;
+
+static void _tf_service_start(int pipe_fd)
+{
+	tf_printf("_tf_service_start\n");
+	jclass c = (*s_jni_env)->FindClass(s_jni_env, "com/unprompted/tildefriends/TildeFriendsActivity");
+	jmethodID start_sandbox = (*s_jni_env)->GetStaticMethodID(s_jni_env, c, "start_sandbox", "(I)V");
+	(*s_jni_env)->CallStaticVoidMethod(s_jni_env, c, start_sandbox, pipe_fd);
+}
+
+static void _tf_service_stop()
+{
+	tf_printf("_tf_service_stop\n");
+	jclass c = (*s_jni_env)->FindClass(s_jni_env, "com/unprompted/tildefriends/TildeFriendsActivity");
+	jmethodID stop_sandbox = (*s_jni_env)->GetStaticMethodID(s_jni_env, c, "stop_sandbox", "()V");
+	(*s_jni_env)->CallStaticVoidMethod(s_jni_env, c, stop_sandbox);
+}
+
+static jint _tf_server_main(JNIEnv* env, jobject this_object, jstring files_dir, jstring apk_path, jstring out_port_file_path)
+{
+	s_jni_env = env;
+
+	tf_printf("This is tf_server_main main.\n");
+	_startup(0, (char*[]) { NULL });
+	tf_printf("That was startup.\n");
+
+	const char* files = (*env)->GetStringUTFChars(env, files_dir, NULL);
+	const char* apk = (*env)->GetStringUTFChars(env, apk_path, NULL);
+	const char* out_port_file = (*env)->GetStringUTFChars(env, out_port_file_path, NULL);
+
+	tf_printf("FILES = %s\n", files);
+	tf_printf("APK = %s\n", apk);
+	tf_printf("OUT_PORT = %s\n", out_port_file);
+
+	int result = uv_chdir(files);
+	if (result)
+	{
+		tf_printf("uv_chdir: %s\n", uv_strerror(result));
+	}
+
+	size_t port_file_arg_length = strlen(out_port_file) + strlen("out_http_port_file=") + 1;
+	char* port_file_arg = alloca(port_file_arg_length);
+	snprintf(port_file_arg, port_file_arg_length, "out_http_port_file=%s", out_port_file);
+
+	const char* args[] = {
+		"run",
+		"-z",
+		apk,
+		"-a",
+		port_file_arg,
+		"-p",
+		"0",
+	};
+
+	tf_task_set_android_service_callbacks(_tf_service_start, _tf_service_stop);
+	result = _tf_command_run(apk, _countof(args), (char**)args);
+	tf_task_set_android_service_callbacks(NULL, NULL);
+
+	(*env)->ReleaseStringUTFChars(env, files_dir, files);
+	(*env)->ReleaseStringUTFChars(env, apk_path, apk);
+	(*env)->ReleaseStringUTFChars(env, out_port_file_path, out_port_file);
+
+	tf_mem_shutdown();
+	tf_printf("tf_server_main finished with %d.", result);
+
+	s_jni_env = NULL;
+	return result;
+}
+
+static jint _tf_sandbox_main(JNIEnv* env, jobject this_object, int pipe_fd)
+{
+	s_jni_env = env;
+
+	tf_printf("This is tf_sandbox_main main (fd=%d).\n", pipe_fd);
+	_startup(0, (char*[]) { NULL });
+	tf_printf("That was startup.\n");
+
+	char fd[32] = { 0 };
+	snprintf(fd, sizeof(fd), "%d", pipe_fd);
+	const char* args[] = {
+		"sandbox",
+		"-f",
+		fd,
+	};
+
+	int result = _tf_command_sandbox(NULL, _countof(args), (char**)args);
+
+	tf_mem_shutdown();
+	tf_printf("tf_sandbox_main finished with %d.", result);
+
+	s_jni_env = NULL;
+	return result;
+}
+
+JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved)
+{
+	tf_printf("JNI_Onload called.\n");
+	JNIEnv* env;
+	if ((*vm)->GetEnv(vm, (void**)&env, JNI_VERSION_1_6) != JNI_OK)
+	{
+		tf_printf("Failed to get JNI environment.\n");
+		return JNI_ERR;
+	}
+
+	tf_printf("Finding class.\n");
+	jclass c = (*env)->FindClass(env, "com/unprompted/tildefriends/TildeFriendsActivity");
+	if (!c)
+	{
+		tf_printf("Failed to find TildeFriendsActivity class.\n");
+		return JNI_ERR;
+	}
+
+	tf_printf("Registering method.\n");
+	static const JNINativeMethod methods[] = {
+		{ "tf_server_main", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)I", _tf_server_main },
+		{ "tf_sandbox_main", "(I)I", _tf_sandbox_main },
+	};
+	int result = (*env)->RegisterNatives(env, c, methods, (int)_countof(methods));
+	if (result != JNI_OK)
+	{
+		return result;
+	}
+
+	tf_printf("Done.\n");
+	return JNI_VERSION_1_6;
+}
+
 int main(int argc, char* argv[])
 {
-	_startup(argc, argv);
+	tf_printf("Welcome to Tilde Friends.  This is not the way to run on Android.\n");
-	int result = -1;
+	return EXIT_FAILURE;
-	if (argc > 1)
-	{
-		if (strcmp(argv[1], "run") == 0)
-		{
-			result = _tf_command_run(argv[0], argc - 1, argv + 1);
-		}
-		else if (strcmp(argv[1], "sandbox") == 0)
-		{
-			result = _tf_command_sandbox(argv[0], argc - 1, argv + 1);
-		}
-	}
-	tf_mem_shutdown();
-	return result;
 }
 #elif TARGET_OS_IPHONE
 void tf_run_thread_start(const char* zip_path)

src/ssb.tests.c

@@ -16,6 +16,10 @@
 #include <time.h>
 #include <unistd.h>
 
+#if !defined(_WIN32)
+#include <sys/wait.h>
+#endif
+
 #if defined(_WIN32)
 #define WIFEXITED(x) 1
 #define WEXITSTATUS(x) (x)

src/task.c

@@ -50,6 +50,9 @@
 static JSClassID _import_class_id;
 static int _count;
 
+static tf_android_start_service_t* s_android_start_service;
+static tf_android_stop_service_t* s_android_stop_service;
+
 extern struct backtrace_state* g_backtrace_state;
 
 typedef struct _export_record_t export_record_t;
@@ -2160,3 +2163,19 @@ static JSValue _tf_task_pokeSandbox(JSContext* context, JSValueConst this_val, i
 #endif
 	return JS_NewInt32(context, WEXITSTATUS(result));
 }
+
+void tf_task_set_android_service_callbacks(tf_android_start_service_t* start_service, tf_android_stop_service_t* stop_service)
+{
+	s_android_start_service = start_service;
+	s_android_stop_service = stop_service;
+}
+
+tf_android_start_service_t* tf_task_get_android_start_service()
+{
+	return s_android_start_service;
+}
+
+tf_android_stop_service_t* tf_task_get_android_stop_service()
+{
+	return s_android_stop_service;
+}

src/task.h

@@ -333,4 +333,35 @@ char* tf_task_get_debug(tf_task_t* task);
 */
 char* tf_task_get_hitches(tf_task_t* task);
 
+/**
+** A callback used to start an Android service.
+** @param pipe_fd A file descriptor with which to communicate with the invoking
+** task.
+*/
+typedef void(tf_android_start_service_t)(int pipe_fd);
+
+/**
+** A callback used to stop an Android service.
+*/
+typedef void(tf_android_stop_service_t)();
+
+/**
+** Set Android service callbacks.
+** @param start_service Start service callback.
+** @param stop_service Stop service callback.
+*/
+void tf_task_set_android_service_callbacks(tf_android_start_service_t* start_service, tf_android_stop_service_t* stop_service);
+
+/**
+** Get the callback registered for starting an Android service.
+** @return the callback.
+*/
+tf_android_start_service_t* tf_task_get_android_start_service();
+
+/**
+** Get the callback registered for stopping an Android service.
+** @return the callback.
+*/
+tf_android_stop_service_t* tf_task_get_android_stop_service();
+
 /** @} */

src/taskstub.js.c

@@ -122,10 +122,11 @@ static JSValue _taskstub_create(JSContext* context, JSValueConst this_val, int a
 	char arg1[] = "sandbox";
 	char* command_argv[] = { _executable, arg1, 0 };
 
+	tf_android_start_service_t* start_service = tf_task_get_android_start_service();
 	JSValue result = JS_NULL;
-	if (tf_task_get_one_proc(parent))
+	if (tf_task_get_one_proc(parent) || start_service)
 	{
-		uv_os_sock_t fds[2];
+		uv_os_sock_t fds[2] = { 0 };
 		int pipe_result = uv_socketpair(SOCK_STREAM, 0, fds, 0, 0);
 		if (pipe_result)
 		{
@@ -133,7 +134,7 @@ static JSValue _taskstub_create(JSContext* context, JSValueConst this_val, int a
 		}
 
 		uv_pipe_t* pipe = tf_packetstream_get_pipe(stub->_stream);
-		memset(pipe, 0, sizeof(*pipe));
+		*pipe = (uv_pipe_t) { 0 };
 		pipe_result = uv_pipe_init(tf_task_get_loop(parent), pipe, 1);
 		if (pipe_result != 0)
 		{
@@ -145,8 +146,16 @@ static JSValue _taskstub_create(JSContext* context, JSValueConst this_val, int a
 			tf_printf("uv_pipe_open failed: %s\n", uv_strerror(pipe_result));
 		}
 
-		uv_thread_t* thread = tf_malloc(sizeof(uv_thread_t));
+		if (start_service)
-		uv_thread_create(thread, _tf_taskstub_run_sandbox_thread, (void*)(intptr_t)fds[1]);
+		{
+			start_service(fds[1]);
+		}
+		else
+		{
+			/* XXX: This is a leak. */
+			uv_thread_t* thread = tf_malloc(sizeof(uv_thread_t));
+			uv_thread_create(thread, _tf_taskstub_run_sandbox_thread, (void*)(intptr_t)fds[1]);
+		}
 
 		tf_packetstream_set_on_receive(stub->_stream, tf_task_on_receive_packet, stub);
 		tf_packetstream_start(stub->_stream);
@@ -443,7 +452,15 @@ JSValue tf_taskstub_kill(tf_taskstub_t* stub)
 	JSValue result = JS_UNDEFINED;
 	if (!tf_task_get_one_proc(stub->_owner))
 	{
-		uv_process_kill(&stub->_process, SIGKILL);
+		tf_android_stop_service_t* stop_service = tf_task_get_android_stop_service();
+		if (stop_service)
+		{
+			stop_service();
+		}
+		else
+		{
+			uv_process_kill(&stub->_process, SIGKILL);
+		}
 	}
 	else
 	{

src/version.h

@@ -1,2 +1,2 @@
-#define VERSION_NUMBER "0.0.21-wip"
+#define VERSION_NUMBER "0.0.21.1"
-#define VERSION_NAME "Psst.  Look behind you."
+#define VERSION_NAME "What are we even doing here?"

tools/ssl-android

@@ -11,23 +11,13 @@ BUILD_DIR=out/openssl_android_build
 
 BUILD_TARGETS="x86_64 x86 arm64-v8a armeabi-v7a"
 
-rm -rf out/openssl-${OPENSSL_VERSION}
+WORK_DIR=out/openssl-${OPENSSL_VERSION}-android
+rm -rf $WORK_DIR
+cp -arf deps/openssl_src/ $WORK_DIR
 
-if [ ! -d out/openssl-${OPENSSL_VERSION} ]
-then
-    if [ ! -f out/openssl-${OPENSSL_VERSION}.tar.gz ]
-    then
-        wget https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz -O out/openssl-${OPENSSL_VERSION}.tar.gz | exit 128
-    fi
-    tar -C out/ -xzf out/openssl-${OPENSSL_VERSION}.tar.gz || exit 128
-fi
-WORK_DIR=out/openssl-${OPENSSL_VERSION}
-
-##### export ndk directory. Required by openssl-build-scripts #####
 export ANDROID_NDK_ROOT
 echo ANDROID_NDK_ROOT=$ANDROID_NDK_ROOT
 
-##### build-function #####
 build_the_thing() {
     TOOLCHAIN=$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64
     export PATH=$TOOLCHAIN/$TRIBLE/bin:$TOOLCHAIN/bin:$PATH
@@ -37,6 +27,7 @@ build_the_thing() {
         no-asm
         no-async
         no-autoerrinit
+        no-autoload-config
         no-cmp
         no-cms
         no-comp
@@ -46,6 +37,8 @@ build_the_thing() {
         no-dsa
         no-dso
         no-dtls
+        no-dtls1
+        no-dtls1-method
         no-dynamic-engine
         no-ec2m
         no-egd
@@ -66,28 +59,32 @@ build_the_thing() {
         no-shared
         no-sock
         no-srp
+        no-ssl
         no-ssl3
         no-ssl-trace
         no-stdio
         no-tests
         no-thread-pool
         no-threads
+        no-tls1
+        no-tls1-method
         no-trace
         no-ui-console
         no-uplink
+        no-whirlpool
         no-weak-ssl-ciphers
         no-zlib
         -Os
-        -DOPENSSL_SMALL_FOOTPRINT"
+        -DOPENSSL_SMALL_FOOTPRINT
+        -flto"
     pwd
-    echo "./Configure $SSL_TARGET $OPTIONS $GLOBAL_OPTIONS -fuse-ld=$TOOLCHAIN/bin/ld" && \
+    echo "./Configure $SSL_TARGET $OPTIONS $GLOBAL_OPTIONS" && \
-    ./Configure $SSL_TARGET $OPTIONS $GLOBAL_OPTIONS -fuse-ld=$TOOLCHAIN/bin/ld no-tests && \
+    ./Configure $SSL_TARGET $OPTIONS $GLOBAL_OPTIONS && \
-    make clean && \
+    make -s clean && \
-    make build_generated && \
+    make -s build_generated && \
-    make libcrypto.a libssl.a || exit 128
+    make -s libcrypto.a libssl.a || exit 128
 }
 
-##### set variables according to build-tagret #####
 for build_target in $BUILD_TARGETS
 do
     echo "Building $build_target"
@@ -128,7 +125,6 @@ do
     rm -rf $DESTDIR
     build_the_thing
     popd
-#### copy libraries and includes to output-directory #####
     echo WORK_DIR=$WORK_DIR
     rm -rf deps/openssl/android/$build_target/
     mkdir -p deps/openssl/android/$build_target/usr/local/include/

tools/ssl-ios

@@ -8,21 +8,10 @@ BUILD_DIR=out/openssl_ios_build
 
 BUILD_TARGETS="ios64-xcrun iossimulator-xcrun"
 
-rm -rfv out/openssl-${OPENSSL_VERSION}
+WORK_DIR=out/openssl-${OPENSSL_VERSION}-ios
+rm -rf $WORK_DIR
+cp -af deps/openssl_src/ $WORK_DIR
 
-if [ ! -d out/openssl-${OPENSSL_VERSION} ]
-then
-    if [ ! -f out/openssl-${OPENSSL_VERSION}.tar.gz ]
-    then
-        curl -L https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz -o out/openssl-${OPENSSL_VERSION}.tar.gz || exit 128
-    fi
-    tar -C out/ -xzf out/openssl-${OPENSSL_VERSION}.tar.gz || exit 128
-fi
-WORK_DIR=out/openssl-${OPENSSL_VERSION}
-
-##### export ndk directory. Required by openssl-build-scripts #####
-
-##### build-function #####
 build_the_thing() {
     export PATH=$TOOLCHAIN/$TRIBLE/bin:$TOOLCHAIN/bin:$PATH
     echo $PATH
@@ -33,7 +22,6 @@ build_the_thing() {
     make libcrypto.a libssl.a || exit 128
 }
 
-##### set variables according to build-tagret #####
 for build_target in $BUILD_TARGETS
 do
     echo "Building $build_target"
@@ -60,7 +48,6 @@ do
     rm -rf $DESTDIR
     build_the_thing
     popd
-#### copy libraries and includes to output-directory #####
     echo WORK_DIR=$WORK_DIR
     rm -rf deps/openssl/ios/$build_target/
     mkdir -p deps/openssl/ios/$build_target/usr/local/include/

tools/ssl-mingw64

@@ -8,21 +8,61 @@ BUILD_DIR=out/openssl_mingw64_build
 
 BUILD_TARGETS="mingw64"
 
-rm -rfv out/openssl-${OPENSSL_VERSION}
+WORK_DIR=out/openssl-${OPENSSL_VERSION}-mingw64
+rm -rf $WORK_DIR
+cp -arf deps/openssl_src/ $WORK_DIR
 
-if [ ! -d out/openssl-${OPENSSL_VERSION} ]
-then
-    if [ ! -f out/openssl-${OPENSSL_VERSION}.tar.gz ]
-    then
-        wget https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz -O out/openssl-${OPENSSL_VERSION}.tar.gz || exit 128
-    fi
-    tar -C out/ -xzf out/openssl-${OPENSSL_VERSION}.tar.gz || exit 128
-fi
-WORK_DIR=out/openssl-${OPENSSL_VERSION}
-
-##### build-function #####
 build_the_thing() {
-    export GLOBAL_OPTIONS="no-trace no-asm no-threads no-md2 no-md4 no-dso no-async no-multiblock no-dgram no-filenames no-shared no-ssl3 no-engine no-dynamic-engine no-zlib no-comp no-psk no-idea no-srp no-weak-ssl-ciphers no-dtls no-egd no-tests -Os"
+    export GLOBAL_OPTIONS="
+        no-apps
+        no-asm
+        no-async
+        no-autoerrinit
+        no-cmp
+        no-cms
+        no-comp
+        no-deprecated
+        no-dgram
+        no-docs
+        no-dsa
+        no-dso
+        no-dtls
+        no-dynamic-engine
+        no-ec2m
+        no-egd
+        no-engine
+        no-err
+        no-filenames
+        no-gost
+        no-http
+        no-idea
+        no-legacy
+        no-md2
+        no-md4
+        no-module
+        no-multiblock
+        no-nextprotoneg
+        no-ocsp
+        no-psk
+        no-shared
+        no-sock
+        no-srp
+        no-ssl-trace
+        no-ssl3
+        no-stdio
+        no-tests
+        no-thread-pool
+        no-threads
+        no-trace
+        no-ui-console
+        no-uplink
+        no-weak-ssl-ciphers
+        no-zlib
+        -Os
+        -ffunction-sections
+        -fdata-sections
+        -flto
+        -DOPENSSL_SMALL_FOOTPRINT"
     echo "./Configure $SSL_TARGET $OPTIONS $GLOBAL_OPTIONS" && \
     ./Configure $SSL_TARGET $OPTIONS $GLOBAL_OPTIONS && \
     make clean && \
@@ -30,7 +70,6 @@ build_the_thing() {
     make libcrypto.a libssl.a || exit 128
 }
 
-##### set variables according to build-tagret #####
 for build_target in $BUILD_TARGETS
 do
     echo "Building $build_target"
@@ -47,7 +86,6 @@ do
     rm -rf $DESTDIR
     build_the_thing
     popd
-#### copy libraries and includes to output-directory #####
     echo WORK_DIR=$WORK_DIR
     rm -rf deps/openssl/$build_target/
     mkdir -p deps/openssl/$build_target/usr/local/include/