From 7af76a6e6f0ec4e23803c0e674308db3625c1049 Mon Sep 17 00:00:00 2001
From: Rakshit Kumar Singh <rakshitsingh421@gmail.com>
Date: Thu, 23 Apr 2026 03:12:49 +0530
Subject: [PATCH 1/2] build version

---
 .github/workflows/build-android.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build-android.yml b/.github/workflows/build-android.yml
index c627802..f6d6aa0 100644
--- a/.github/workflows/build-android.yml
+++ b/.github/workflows/build-android.yml
@@ -114,6 +114,7 @@ jobs:
           alias: ${{ secrets.KEY_ALIAS }}
           keyStorePassword: ${{ secrets.KEYSTORE_PASSWORD }}
           keyPassword: ${{ secrets.KEY_PASSWORD }}
+          buildToolsVersion: 35.0.0
 
       - name: Upload APK artifact
         if: github.ref != 'refs/heads/release'

From 270d496101b90cc1ed3d0f1166563f98a8cd2538 Mon Sep 17 00:00:00 2001
From: Rakshit Kumar Singh <rakshitsingh421@gmail.com>
Date: Thu, 23 Apr 2026 03:18:23 +0530
Subject: [PATCH 2/2] use jar signer

---
 .github/workflows/build-android.yml | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build-android.yml b/.github/workflows/build-android.yml
index f6d6aa0..19c6256 100644
--- a/.github/workflows/build-android.yml
+++ b/.github/workflows/build-android.yml
@@ -106,15 +106,20 @@ jobs:
 
       - name: Sign APK
         if: github.ref == 'refs/heads/release' || github.event_name == 'workflow_dispatch'
-        uses: r0adkll/sign-android-release@v1
         id: sign_apk
-        with:
-          releaseDirectory: android/app/build/outputs/apk/release
-          signingKeyBase64: ${{ secrets.KEYSTORE_BASE64 }}
-          alias: ${{ secrets.KEY_ALIAS }}
-          keyStorePassword: ${{ secrets.KEYSTORE_PASSWORD }}
-          keyPassword: ${{ secrets.KEY_PASSWORD }}
-          buildToolsVersion: 35.0.0
+        run: |
+          echo "${{ secrets.KEYSTORE_BASE64 }}" | base64 -d > keystore.jks
+          APK=$(find android/app/build/outputs/apk/release -name "*-unsigned.apk" | head -1)
+          SIGNED=android/app/build/outputs/apk/release/LensApp-signed.apk
+          jarsigner -verbose \
+            -keystore keystore.jks \
+            -storepass "${{ secrets.KEYSTORE_PASSWORD }}" \
+            -keypass "${{ secrets.KEY_PASSWORD }}" \
+            -signedjar "$SIGNED" \
+            "$APK" "${{ secrets.KEY_ALIAS }}"
+          $ANDROID_HOME/build-tools/35.0.0/zipalign -v 4 "$SIGNED" "${SIGNED%.apk}-aligned.apk"
+          echo "signedReleaseFile=${SIGNED%.apk}-aligned.apk" >> $GITHUB_OUTPUT
+          rm keystore.jks
 
       - name: Upload APK artifact
         if: github.ref != 'refs/heads/release'