From e3470d07e7bb6f91f368f09d47a5873f5da3d46e Mon Sep 17 00:00:00 2001
From: Daniel <danitex@danvics.com>
Date: Sun, 10 May 2026 18:31:57 +0200
Subject: [PATCH] ci: harden forgejo android signing restore

---
 .forgejo/workflows/android-apk.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.forgejo/workflows/android-apk.yml b/.forgejo/workflows/android-apk.yml
index b9be682..42424f0 100644
--- a/.forgejo/workflows/android-apk.yml
+++ b/.forgejo/workflows/android-apk.yml
@@ -43,7 +43,9 @@ jobs:
           KEYSTORE_B64: ${{ secrets.ANDROID_KEYSTORE_BASE64 }}
         run: |
           test -n "$KEYSTORE_B64"
-          echo "$KEYSTORE_B64" | base64 -d > "$RUNNER_TEMP/pedscribe-release.jks"
+          CLEAN_KEYSTORE_B64="${KEYSTORE_B64#ANDROID_KEYSTORE_BASE64=}"
+          printf '%s' "$CLEAN_KEYSTORE_B64" | tr -d '\r\n' | base64 -d > "$RUNNER_TEMP/pedscribe-release.jks"
+          test -s "$RUNNER_TEMP/pedscribe-release.jks"
 
       - name: Build signed release APK
         working-directory: mobile/android