From 3012f846638caf9c743e8a903c32aff89e4c09a6 Mon Sep 17 00:00:00 2001
From: Bytemalte <malxte@gmx.de>
Date: Wed, 11 Feb 2026 13:11:37 +0100
Subject: [PATCH] Update android workflow to universal apk

---
 .gitea/workflows/android.yaml | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/.gitea/workflows/android.yaml b/.gitea/workflows/android.yaml
index c755518..9fd71e3 100644
--- a/.gitea/workflows/android.yaml
+++ b/.gitea/workflows/android.yaml
@@ -2,7 +2,7 @@ name: Android Build Final Fixed
 on:
   push:
     branches: [main]
-    tags: ["v*"] # Triggert bei v0.1.0, v1.0, etc.
+    tags: ["v*"]
 
 jobs:
   build-android:
@@ -31,15 +31,15 @@ jobs:
           curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
           echo "$HOME/.cargo/bin" >> $GITHUB_PATH
           export PATH="$HOME/.cargo/bin:$PATH"
-          # Alle Architekturen für Universal APK hinzufügen
           rustup target add aarch64-linux-android armv7-linux-androideabi i686-linux-android x86_64-linux-android
           rustup target add wasm32-unknown-unknown
 
-      - name: Install Trunk & Tauri-CLI
+      - name: Install Trunk & Tauri-CLI (Fixed)
         run: |
-          wget -qO- https://github.com/trunk-rs/trunk/releases/latest/download/trunk-x86_64-unknown-linux-gnu.tar.gz | tar -xzf- -C /usr/local/bin
-          wget -qO- https://github.com/tauri-apps/tauri/releases/latest/download/cargo-tauri-x86_64-unknown-linux-gnu.tgz | tar -xzf- -C /usr/local/bin
-          chmod +x /usr/local/bin/trunk /usr/local/bin/cargo-tauri
+          export PATH="$HOME/.cargo/bin:$PATH"
+          # Installation via Cargo ist sicherer als wget von GitHub Releases
+          cargo install trunk
+          cargo install tauri-cli --version "^2.0.0"
 
       - name: Setup Android SDK
         run: |
@@ -63,22 +63,19 @@ jobs:
           # 1. Frontend bauen
           trunk build --release
 
-          # 2. Android Build initialisieren falls nötig
+          # 2. Android Build
           if [ ! -d "src-tauri/gen/android" ]; then
-            cargo-tauri android init
+            cargo tauri android init
           fi
 
-          # Universal APK bauen (erzeugt die Datei laut deinem Log)
-          cargo-tauri android build --release --apk
+          cargo tauri android build --release --apk
 
           # 3. APK manuell signieren
           echo "${{ secrets.ANDROID_KEYSTORE_BASE64 }}" | tr -d '[:space:]' > keystore.b64
           base64 -d keystore.b64 > release.keystore
 
-          # Pfad basierend auf deinem lokalen erfolgreichen Build
           UNSIGNED_APK=$(find src-tauri/gen/android/app/build/outputs/apk/universal/release -name "app-universal-release-unsigned.apk" | head -n 1)
 
-          # Fallback falls find nichts liefert
           if [ -z "$UNSIGNED_APK" ]; then
              UNSIGNED_APK="src-tauri/gen/android/app/build/outputs/apk/universal/release/app-universal-release-unsigned.apk"
           fi
@@ -94,7 +91,7 @@ jobs:
             --out Marstemedia-Universal-Signed.apk \
             "$UNSIGNED_APK"
 
-          echo "Signierung der Universal APK erfolgreich!"
+          echo "Signierung erfolgreich!"
         env:
           JAVA_HOME: /usr/lib/jvm/java-17-openjdk-amd64