build: Use this apksigner workaround for reproducible builds: https://gitlab.com/fdroid/fdroiddata/-/issues/3299.

.gitea/workflows/build.yaml

@@ -48,7 +48,7 @@ jobs:
       - name: Build documentation
         run: |
           mkdir -p out/html/ ~/.ssh/
-          make docs
+          make -j`nproc` docs
           echo 'pildefriends ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKD3Kde5vDO0TrMBDK0IGGeNGe/XinWAZkSQ/rXxwUjt' >> ~/.ssh/known_hosts
           rsync -avP --delete -e "ssh -i /opt/keys/ssh.ed25519" out/html/ tfdocs@pildefriends:docs/html/
       - name: Setup JDK
@@ -59,11 +59,11 @@ jobs:
       - name: Setup Android SDK
         uses: android-actions/setup-android@v3
         with:
-          packages: 'tools platform-tools build-tools;34.0.0 platforms;android-34 ndk;26.3.11579264'
+          packages: 'tools platform-tools build-tools;35.0.0 platforms;android-35 ndk;27.2.12479018'
       - name: Docker build
         run: DOCKER_BUILDKIT=1 docker build .
       - name: Build
-        run: ANDROID_SDK=$HOME/.android/sdk make -j`nproc` all dist docs
+        run: ANDROID_SDK=$HOME/.android/sdk make -j`nproc` all dist
       - name: Upload artifacts
         uses: actions/upload-artifact@v3
         with:

GNUmakefile

@@ -18,7 +18,7 @@ MAKEFLAGS += --no-builtin-rules
 
 VERSION_CODE := 39
 VERSION_CODE_IOS := 15
-VERSION_NUMBER := 0.0.33-wip
+VERSION_NUMBER := 0.0.32.1
 VERSION_NAME := This program kills fascists.
 
 IPHONEOS_VERSION_MIN=14.0
@@ -106,10 +106,10 @@ LDFLAGS += \
 	-Wno-aggressive-loop-optimizations
 
 ANDROID_MIN_SDK_VERSION := 24
-ANDROID_TARGET_SDK_VERSION := 34
-ANDROID_BUILD_TOOLS := $(ANDROID_SDK)/build-tools/34.0.0
+ANDROID_TARGET_SDK_VERSION := 35
+ANDROID_BUILD_TOOLS := $(ANDROID_SDK)/build-tools/35.0.0
 ANDROID_PLATFORM := $(ANDROID_SDK)/platforms/android-$(ANDROID_TARGET_SDK_VERSION)
-ANDROID_NDK ?= $(ANDROID_SDK)/ndk/26.3.11579264
+ANDROID_NDK ?= $(ANDROID_SDK)/ndk/27.2.12479018
 
 ANDROID_ARMV7A_TARGETS := \
 	out/androiddebug-armv7a/tildefriends \
@@ -1055,7 +1055,7 @@ out/TildeFriends.aab: out/apk/classes.dex $(filter-out %debug%, $(ANDROID_TARGET
 	@$(ANDROID_NDK)/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip --only-keep-debug out/androidrelease-x86_64/tildefriends -o out/aab/staging/BUNDLE-METADATA/com.android.tools.build.debugsymbols/x86_64/libtildefriends.so.sym
 	@$(ANDROID_NDK)/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip --only-keep-debug out/androidrelease-x86/tildefriends -o out/aab/staging/BUNDLE-METADATA/com.android.tools.build.debugsymbols/x86/libtildefriends.so.sym
 	@cd out/aab/staging; zip -u ../../../$@ BUNDLE-METADATA/com.android.tools.build.debugsymbols/arm64-v8a/libtildefriends.so.sym BUNDLE-METADATA/com.android.tools.build.debugsymbols/armeabi-v7a/libtildefriends.so.sym BUNDLE-METADATA/com.android.tools.build.debugsymbols/x86_64/libtildefriends.so.sym BUNDLE-METADATA/com.android.tools.build.debugsymbols/x86/libtildefriends.so.sym; cd ../../../
-	@$(ANDROID_BUILD_TOOLS)/apksigner sign -ks .keys/android.jks --ks-key-alias androidKey -ks-pass pass:android --min-sdk-version=$(ANDROID_MIN_SDK_VERSION) $@
+	@$(ANDROID_BUILD_TOOLS)/apksigner sign -ks .keys/android.jks --ks-key-alias androidKey -ks-pass pass:android --min-sdk-version=$(ANDROID_MIN_SDK_VERSION) --alignment-preserved $@
 
 aab: out/TildeFriends.aab ## Build an Android App Bundle.
 .PHONY: aab
@@ -1117,12 +1117,12 @@ out/apk/TildeFriends-%.fdroid.unsigned.apk:
 
 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 $@ $<
+	@$(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 $@ --alignment-preserved $<
 
 out/%.zopfli.apk: out/%.apk
 	@echo "[zopfli] $(notdir $@)"
 	$(ANDROID_BUILD_TOOLS)/zipalign -f -z 4 $< $@.zopfli
-	@$(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 $@ $@.zopfli
+	@$(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 $@ --alignment-preserved $@.zopfli
 
 release-apk: out/TildeFriends-arm-release.zopfli.apk out/TildeFriends-x86-release.zopfli.apk ## Build an Android release APK.
 .PHONY: release-apk

apps/ssb.json

@@ -1,5 +1,5 @@
 {
 	"type": "tildefriends-app",
 	"emoji": "🦀",
-	"previous": "&fAgPjWyRwHxcKiSV3T8OE7UyAUUgHE02YnA7e+sm3lo=.sha256"
+	"previous": "&Ym1vefMN4CV4UIgLuV+zu52qj58WwIScctt4v5YIHmQ=.sha256"
 }

apps/ssb/tf-app.js

@@ -360,7 +360,7 @@ class TfElement extends LitElement {
 		let start = new Date();
 		let result = await tfrpc.rpc.query(sql, args);
 		let end = new Date();
-		console.log((end - start) / 1000, sql);
+		console.log((end - start) / 1000, sql.replaceAll(/\s+/g, ' ').trim());
 		return result;
 	}
 

apps/ssb/tf-compose.js

@@ -581,7 +581,7 @@ class TfComposeElement extends LitElement {
 						class="w3-button w3-bar-item w3-theme-d1"
 						@click=${() => this.set_encrypt([])}
 					>
-						🔐
+						🔐 Encrypt
 					</button>`;
 		let result = html`
 			<style>
@@ -602,7 +602,7 @@ class TfComposeElement extends LitElement {
 						: undefined}
 					${this.render_encrypt()}
 				</header>
-				<div class="w3-container w3-padding-small">
+				<div class="w3-container" style="padding: 0 0 16px 0">
 					<div class="w3-half">
 						<span
 							class="w3-input w3-theme-d1 w3-border"
@@ -623,7 +623,7 @@ class TfComposeElement extends LitElement {
 				${Object.values(draft.mentions || {}).map((x) =>
 					self.render_mention(x)
 				)}
-				<footer class="w3-container">
+				<footer>
 					${this.render_attach_app()} ${this.render_content_warning()}
 					${this.render_new_thread()}
 					<button

apps/ssb/tf-news.js

@@ -233,7 +233,19 @@ class TfNewsElement extends LitElement {
 									<div
 										style="border-bottom: 1px solid #f00; flex: 1; align-self: center; height: 1px"
 									></div>
-									<div style="color: #f00; padding: 8px">unread</div>
+									<button
+										style="color: #f00; padding: 8px"
+										class="w3-button"
+										@click=${() =>
+											this.dispatchEvent(
+												new Event('mark_all_read', {
+													bubbles: true,
+													composed: true,
+												})
+											)}
+									>
+										unread
+									</button>
 									<div
 										style="border-bottom: 1px solid #f00; flex: 1; align-self: center; height: 1px"
 									></div>

apps/ssb/tf-tab-news-feed.js

@@ -486,6 +486,7 @@ class TfTabNewsFeedElement extends LitElement {
 				channel=${this.channel()}
 				channel_unread=${this.channels_unread?.[this.channel()]}
 				.recent_reactions=${this.recent_reactions}
+				@mark_all_read=${this.mark_all_read}
 			></tf-news>
 			${more}
 		`);

metadata/en-US/changelogs/39.txt

@@ -0,0 +1,2 @@
+* Updating Android SDK+target versions.
+* Minor UI improvements.

src/android/AndroidManifest.xml

@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	package="com.unprompted.tildefriends"
 	android:versionCode="39"
-	android:versionName="0.0.33-wip">
+	android:versionName="0.0.32.1">
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
 	<uses-permission android:name="android.permission.INTERNET"/>
 	<application

src/ios/Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.0.33</string>
+	<string>0.0.32.1</string>
 	<key>CFBundleSupportedPlatforms</key>
 	<array>
 		<string>iPhoneOS</string>

src/version.h

@@ -1,2 +1,2 @@
-#define VERSION_NUMBER "0.0.33-wip"
+#define VERSION_NUMBER "0.0.32.1"
 #define VERSION_NAME "This program kills fascists."