Fixes based on feedback

Author: Pururun

.github/workflows/android-reproducible-builds.yml

@@ -29,7 +29,7 @@ jobs:
       - name: Upload apks
         uses: actions/upload-artifact@v4
         with:
-          name: app-oss-prod-fdroid-container.apk
+          name: container-app
           path: android/app/build/outputs/apk/ossProd/fdroid/app-oss-prod-fdroid-unsigned.apk
           if-no-files-found: error
           retention-days: 7
@@ -59,7 +59,7 @@ jobs:
         with:
           path: app-repo
 
-      - name: Prepare fdroid
+      - name: Init fdroid
         run: fdroid init
 
       - name: Prepare metadata
@@ -77,9 +77,9 @@ jobs:
       - name: Upload apks
         uses: actions/upload-artifact@v4
         with:
-          name: app-oss-prod-fdroid-server.apk
+          name: fdroidserver-app
           path: |
-            build/net\.mullvad\.mullvadvpn/android/app/build/outputs/apk/ossProd/fdroid/app-oss-prod-fdroid-unsigned.apk
+            build/**/app-oss-prod-fdroid-unsigned.apk
           if-no-files-found: error
           retention-days: 7
 
@@ -91,30 +91,25 @@ jobs:
       - name: Download container apk
         uses: actions/download-artifact@v4
         with:
-          name: app-oss-prod-fdroid-container.apk
+          name: container-app
           path: container
 
       - name: Download server apk
         uses: actions/download-artifact@v4
         with:
-          name: app-oss-prod-fdroid-server.apk
-          path: server
+          name: fdroidserver-app
+          path: fdroidserver
 
-      - name: Show checksums
+      - name: Print checksums
         run: |
           echo "Container build checksum"
           md5sum container/app-oss-prod-fdroid-unsigned.apk
-          echo "Fdroid build checksum"
-          md5sum server/app-oss-prod-fdroid-unsigned.apk
-
-      - name: Copy files
-        run: |
-          cp container/app-oss-prod-fdroid-unsigned.apk container.apk
-          cp server/app-oss-prod-fdroid-unsigned.apk server.apk
+          echo "Fdroidserver build checksum"
+          md5sum fdroidserver/app-oss-prod-fdroid-unsigned.apk
 
       - name: Compare files
         run: >
-          if [[ $(md5sum *.apk | awk '{print $1}' | uniq | wc -l) -eq 1 ]]
+          if [[ -z $(diff container/app-oss-prod-fdroid-unsigned.apk fdroidserver/app-oss-prod-fdroid-unsigned.apk) ]]
           then echo "Equal checksums";
           else echo "Checksums are different";
           exit 1; fi