Merge remote-tracking branch 'origin/Develop' into Develop

# Conflicts:
#	.gitea/workflows/release.yaml

.gitea/workflows/release.yaml

@@ -28,15 +28,17 @@ jobs:
       - name: Install dependencies
         run: flutter pub get
 
-       - name: Setup Android Keystore
+      # ADD THIS NEW STEP
+      - name: Setup Android Keystore
         env:
           KEYSTORE_BASE64: ${{ secrets.KEYSTORE_BASE64 }}
           KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
           KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
         run: |
-        # Decode the base64 string back into the binary .jks file
+          # Decode the base64 string back into the binary .jks file
           echo "$KEYSTORE_BASE64" | base64 --decode > android/app/upload-keystore.jks
           
+          # Create the key.properties file that build.gradle expects
           echo "storePassword=$KEY_PASSWORD" > android/key.properties
           echo "keyPassword=$KEY_PASSWORD" >> android/key.properties
           echo "keyAlias=$KEY_ALIAS" >> android/key.properties
@@ -58,7 +60,9 @@ jobs:
         run: |
           mkdir -p fdroid
           cd fdroid
-    
+          
+          # Try to download the existing repo/ folder from Hetzner to keep older versions and the keystore
+          # If it fails (first time), we just initialize a new one
           sshpass -p "$PASS" scp -o StrictHostKeyChecking=no -r $USER@$HOST:dev/fdroid/repo . || fdroid init
 
       - name: Copy new APK to repo