From 8f25245ad1efe774c42048ed898b86e133e6cd32 Mon Sep 17 00:00:00 2001
From: Imran Remtulla <30463115+ImranR98@users.noreply.github.com>
Date: Fri, 6 Oct 2023 21:47:25 -0400
Subject: [PATCH 01/35] Update release.yml

---
 .github/workflows/release.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index ead8289..216740c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -22,10 +22,10 @@ jobs:
         env:
           KEYSTORE_BASE64: ${{ secrets.KEYSTORE_BASE64 }}
           KEYSTORE_PASS: ${{ secrets.KEYSTORE_PASS }}
-          GPG_KEY: ${{ secrets.GPG_KEY }}
+          GPG_KEY: ${{ secrets.PGP_KEY_BASE64 }}
         run: |
           echo "${KEYSTORE_BASE64}" | base64 -d > apksign.keystore
-          echo "$GPG_KEY" | gpg --import
+          echo "$GPG_KEY" | base64 -d | gpg --import
           for apk in ./build/app/outputs/flutter-apk/*-release*.apk; do
             unsignedFn=${apk/-release/-unsigned}
             mv "$apk" "$unsignedFn"

From 65187cb17bec81d3be7b096cb9b7af5b56bc7444 Mon Sep 17 00:00:00 2001
From: Imran Remtulla <30463115+ImranR98@users.noreply.github.com>
Date: Fri, 6 Oct 2023 22:04:55 -0400
Subject: [PATCH 02/35] Update release.yml

---
 .github/workflows/release.yml | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 216740c..a438fb5 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -13,6 +13,16 @@ jobs:
         
       - uses: subosito/flutter-action@v2
 
+      - name: Temp
+        env:
+          PGP_KEY_BASE64: ${{ secrets.PGP_KEY_BASE64 }}
+          PGP_KEY_PASSPHRASE: ${{ secrets.PGP_KEY_PASSPHRASE }}
+        run: |
+          echo "$PGP_KEY_BASE64" | base64 -d | gpg --import --passphrase "$PGP_KEY_PASSPHRASE"
+          PGP_KEY_FINGERPRINT="$(gpg --list-keys --with-colon "$(echo "$PGP_KEY_BASE64" | base64 -d | gpg --with-fingerprint --list-packets | grep 'user ID' | awk -F'"' '{print $2}')" | awk -F: '/^pub:/ { print $5 }')"
+          gpg --batch --yes --delete-secret-keys "$PGP_KEY_FINGERPRINT"
+          gpg --batch --yes --delete-keys "$PGP_KEY_FINGERPRINT"
+
       - name: Build APKs
         run: |
           sed -i 's/signingConfig signingConfigs.release//g' android/app/build.gradle
@@ -22,10 +32,12 @@ jobs:
         env:
           KEYSTORE_BASE64: ${{ secrets.KEYSTORE_BASE64 }}
           KEYSTORE_PASS: ${{ secrets.KEYSTORE_PASS }}
-          GPG_KEY: ${{ secrets.PGP_KEY_BASE64 }}
+          PGP_KEY_BASE64: ${{ secrets.PGP_KEY_BASE64 }}
+          PGP_KEY_PASSPHRASE: ${{ secrets.PGP_KEY_PASSPHRASE }}
         run: |
           echo "${KEYSTORE_BASE64}" | base64 -d > apksign.keystore
-          echo "$GPG_KEY" | base64 -d | gpg --import
+          echo "$PGP_KEY_BASE64" | base64 -d | gpg --import --passphrase "$PGP_KEY_PASSPHRASE"
+          PGP_KEY_FINGERPRINT="$(gpg --list-keys --with-colon "$(echo "$PGP_KEY_BASE64" | base64 -d | gpg --with-fingerprint --list-packets | grep 'user ID' | awk -F'"' '{print $2}')" | awk -F: '/^pub:/ { print $5 }')"
           for apk in ./build/app/outputs/flutter-apk/*-release*.apk; do
             unsignedFn=${apk/-release/-unsigned}
             mv "$apk" "$unsignedFn"
@@ -34,6 +46,8 @@ jobs:
             gpg --sign --detach-sig "$apk".sha256
           done
           rm apksign.keystore
+          gpg --batch --yes --delete-secret-keys "$PGP_KEY_FINGERPRINT"
+          gpg --batch --yes --delete-keys "$PGP_KEY_FINGERPRINT"
         
       - name: Extract Version
         id: extract_version      
@@ -48,7 +62,7 @@ jobs:
       - name: Create Release And Upload APKs
         uses: ncipollo/release-action@v1
         with:
-          token: ${{ secrets.GAT }}
+          token: ${{ secrets.GITHUB_ACCESS_TOKEN }}
           tag: "${{ steps.extract_version.outputs.tag }}"
           prerelease: "${{ steps.extract_version.outputs.beta }}"
           artifacts: ./build/app/outputs/flutter-apk/*-release*.apk*

From ce259764a885fea6c52a51f41ed312fa9a51c4fc Mon Sep 17 00:00:00 2001
From: Imran Remtulla <30463115+ImranR98@users.noreply.github.com>
Date: Fri, 6 Oct 2023 22:09:33 -0400
Subject: [PATCH 03/35] Update release.yml

---
 .github/workflows/release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index a438fb5..faafc38 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -16,9 +16,9 @@ jobs:
       - name: Temp
         env:
           PGP_KEY_BASE64: ${{ secrets.PGP_KEY_BASE64 }}
-          PGP_KEY_PASSPHRASE: ${{ secrets.PGP_KEY_PASSPHRASE }}
         run: |
           echo "$PGP_KEY_BASE64" | base64 -d | gpg --import --passphrase "$PGP_KEY_PASSPHRASE"
+          echo A
           PGP_KEY_FINGERPRINT="$(gpg --list-keys --with-colon "$(echo "$PGP_KEY_BASE64" | base64 -d | gpg --with-fingerprint --list-packets | grep 'user ID' | awk -F'"' '{print $2}')" | awk -F: '/^pub:/ { print $5 }')"
           gpg --batch --yes --delete-secret-keys "$PGP_KEY_FINGERPRINT"
           gpg --batch --yes --delete-keys "$PGP_KEY_FINGERPRINT"

From ef40f3900fecb12a10f7f5d628927d706c292109 Mon Sep 17 00:00:00 2001
From: Imran Remtulla <30463115+ImranR98@users.noreply.github.com>
Date: Fri, 6 Oct 2023 22:11:25 -0400
Subject: [PATCH 04/35] Update release.yml

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

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index faafc38..67a996d 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -17,6 +17,7 @@ jobs:
         env:
           PGP_KEY_BASE64: ${{ secrets.PGP_KEY_BASE64 }}
         run: |
+          export GPG_TTY=$(tty)
           echo "$PGP_KEY_BASE64" | base64 -d | gpg --import --passphrase "$PGP_KEY_PASSPHRASE"
           echo A
           PGP_KEY_FINGERPRINT="$(gpg --list-keys --with-colon "$(echo "$PGP_KEY_BASE64" | base64 -d | gpg --with-fingerprint --list-packets | grep 'user ID' | awk -F'"' '{print $2}')" | awk -F: '/^pub:/ { print $5 }')"

From 66446cbffc3a9258d0c4a1dfed409b7d8de6b0a0 Mon Sep 17 00:00:00 2001
From: Imran Remtulla <30463115+ImranR98@users.noreply.github.com>
Date: Fri, 6 Oct 2023 22:16:41 -0400
Subject: [PATCH 05/35] Update release.yml

---
 .github/workflows/release.yml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 67a996d..c83aeb3 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -13,14 +13,17 @@ jobs:
         
       - uses: subosito/flutter-action@v2
 
+      - name: Import GPG key
+        id: import_pgp_key
+        uses: crazy-max/ghaction-import-gpg@v6
+        with:
+          gpg_private_key: ${{ secrets.PGP_KEY_BASE64 }}
+
       - name: Temp
         env:
           PGP_KEY_BASE64: ${{ secrets.PGP_KEY_BASE64 }}
         run: |
-          export GPG_TTY=$(tty)
-          echo "$PGP_KEY_BASE64" | base64 -d | gpg --import --passphrase "$PGP_KEY_PASSPHRASE"
-          echo A
-          PGP_KEY_FINGERPRINT="$(gpg --list-keys --with-colon "$(echo "$PGP_KEY_BASE64" | base64 -d | gpg --with-fingerprint --list-packets | grep 'user ID' | awk -F'"' '{print $2}')" | awk -F: '/^pub:/ { print $5 }')"
+          PGP_KEY_FINGERPRINT="${{ steps.import_pgp_key.outputs.tag }}"
           gpg --batch --yes --delete-secret-keys "$PGP_KEY_FINGERPRINT"
           gpg --batch --yes --delete-keys "$PGP_KEY_FINGERPRINT"
 

From 01385991200723e07c13caea7c4bd8ee624e5839 Mon Sep 17 00:00:00 2001
From: Imran Remtulla <30463115+ImranR98@users.noreply.github.com>
Date: Fri, 6 Oct 2023 22:23:45 -0400
Subject: [PATCH 06/35] Update release.yml

---
 .github/workflows/release.yml | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index c83aeb3..dfa2716 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -20,10 +20,9 @@ jobs:
           gpg_private_key: ${{ secrets.PGP_KEY_BASE64 }}
 
       - name: Temp
-        env:
-          PGP_KEY_BASE64: ${{ secrets.PGP_KEY_BASE64 }}
         run: |
-          PGP_KEY_FINGERPRINT="${{ steps.import_pgp_key.outputs.tag }}"
+          echo -n "Hello, World!" | gpg --clearsign
+          PGP_KEY_FINGERPRINT="${{ steps.import_pgp_key.outputs.fingerprint }}"
           gpg --batch --yes --delete-secret-keys "$PGP_KEY_FINGERPRINT"
           gpg --batch --yes --delete-keys "$PGP_KEY_FINGERPRINT"
 
@@ -36,12 +35,8 @@ jobs:
         env:
           KEYSTORE_BASE64: ${{ secrets.KEYSTORE_BASE64 }}
           KEYSTORE_PASS: ${{ secrets.KEYSTORE_PASS }}
-          PGP_KEY_BASE64: ${{ secrets.PGP_KEY_BASE64 }}
-          PGP_KEY_PASSPHRASE: ${{ secrets.PGP_KEY_PASSPHRASE }}
         run: |
           echo "${KEYSTORE_BASE64}" | base64 -d > apksign.keystore
-          echo "$PGP_KEY_BASE64" | base64 -d | gpg --import --passphrase "$PGP_KEY_PASSPHRASE"
-          PGP_KEY_FINGERPRINT="$(gpg --list-keys --with-colon "$(echo "$PGP_KEY_BASE64" | base64 -d | gpg --with-fingerprint --list-packets | grep 'user ID' | awk -F'"' '{print $2}')" | awk -F: '/^pub:/ { print $5 }')"
           for apk in ./build/app/outputs/flutter-apk/*-release*.apk; do
             unsignedFn=${apk/-release/-unsigned}
             mv "$apk" "$unsignedFn"
@@ -50,6 +45,7 @@ jobs:
             gpg --sign --detach-sig "$apk".sha256
           done
           rm apksign.keystore
+          PGP_KEY_FINGERPRINT="${{ steps.import_pgp_key.outputs.fingerprint }}"
           gpg --batch --yes --delete-secret-keys "$PGP_KEY_FINGERPRINT"
           gpg --batch --yes --delete-keys "$PGP_KEY_FINGERPRINT"
         

From df7b74e727b09d2980ad9c9175d0327fcdb9e06e Mon Sep 17 00:00:00 2001
From: Imran Remtulla <30463115+ImranR98@users.noreply.github.com>
Date: Fri, 6 Oct 2023 22:28:02 -0400
Subject: [PATCH 07/35] Update release.yml

---
 .github/workflows/release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index dfa2716..9b56fd0 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -21,7 +21,7 @@ jobs:
 
       - name: Temp
         run: |
-          echo -n "Hello, World!" | gpg --clearsign
+          echo -n "Hello, World!" | gpg --batch --pinentry-mode loopback --clearsign
           PGP_KEY_FINGERPRINT="${{ steps.import_pgp_key.outputs.fingerprint }}"
           gpg --batch --yes --delete-secret-keys "$PGP_KEY_FINGERPRINT"
           gpg --batch --yes --delete-keys "$PGP_KEY_FINGERPRINT"

From 3d5411ef28fe423dce8d2b8d6f437f483cd2bfd8 Mon Sep 17 00:00:00 2001
From: Imran Remtulla <30463115+ImranR98@users.noreply.github.com>
Date: Fri, 6 Oct 2023 22:32:23 -0400
Subject: [PATCH 08/35] Update release.yml

---
 .github/workflows/release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 9b56fd0..9401d94 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -21,8 +21,8 @@ jobs:
 
       - name: Temp
         run: |
-          echo -n "Hello, World!" | gpg --batch --pinentry-mode loopback --clearsign
           PGP_KEY_FINGERPRINT="${{ steps.import_pgp_key.outputs.fingerprint }}"
+          echo -n "Hello, World!" | gpg --batch --clearsign --local-user "$PGP_KEY_FINGERPRINT"
           gpg --batch --yes --delete-secret-keys "$PGP_KEY_FINGERPRINT"
           gpg --batch --yes --delete-keys "$PGP_KEY_FINGERPRINT"
 

From 36a8b04c4f0788fd7459b04728809f5833b804e6 Mon Sep 17 00:00:00 2001
From: Imran Remtulla <30463115+ImranR98@users.noreply.github.com>
Date: Fri, 6 Oct 2023 22:35:40 -0400
Subject: [PATCH 09/35] Update release.yml

---
 .github/workflows/release.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 9401d94..056cb75 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -22,7 +22,8 @@ jobs:
       - name: Temp
         run: |
           PGP_KEY_FINGERPRINT="${{ steps.import_pgp_key.outputs.fingerprint }}"
-          echo -n "Hello, World!" | gpg --batch --clearsign --local-user "$PGP_KEY_FINGERPRINT"
+          export GPG_TTY=$(tty)
+          echo -n "Hello, World!" | gpg --batch --clearsign --pinentry-mode loopback --passphrase "" --local-user "$PGP_KEY_FINGERPRINT"
           gpg --batch --yes --delete-secret-keys "$PGP_KEY_FINGERPRINT"
           gpg --batch --yes --delete-keys "$PGP_KEY_FINGERPRINT"
 

From 035df1f33841eb095433d991e8d462ccdb045356 Mon Sep 17 00:00:00 2001
From: Imran Remtulla <30463115+ImranR98@users.noreply.github.com>
Date: Fri, 6 Oct 2023 22:38:01 -0400
Subject: [PATCH 10/35] Update release.yml

---
 .github/workflows/release.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 056cb75..70eb0d1 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -23,7 +23,8 @@ jobs:
         run: |
           PGP_KEY_FINGERPRINT="${{ steps.import_pgp_key.outputs.fingerprint }}"
           export GPG_TTY=$(tty)
-          echo -n "Hello, World!" | gpg --batch --clearsign --pinentry-mode loopback --passphrase "" --local-user "$PGP_KEY_FINGERPRINT"
+          echo abc > abc
+          gpg --sign --detach-sig ./abc
           gpg --batch --yes --delete-secret-keys "$PGP_KEY_FINGERPRINT"
           gpg --batch --yes --delete-keys "$PGP_KEY_FINGERPRINT"
 

From 5735293efb8386814b5c5bd7ea6daf824ca27725 Mon Sep 17 00:00:00 2001
From: Imran Remtulla <30463115+ImranR98@users.noreply.github.com>
Date: Fri, 6 Oct 2023 22:40:27 -0400
Subject: [PATCH 11/35] Update release.yml

---
 .github/workflows/release.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 70eb0d1..c57175b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -22,8 +22,8 @@ jobs:
       - name: Temp
         run: |
           PGP_KEY_FINGERPRINT="${{ steps.import_pgp_key.outputs.fingerprint }}"
-          export GPG_TTY=$(tty)
-          echo abc > abc
+          # export GPG_TTY=$(tty)
+          echo 'abc' > ./abc
           gpg --sign --detach-sig ./abc
           gpg --batch --yes --delete-secret-keys "$PGP_KEY_FINGERPRINT"
           gpg --batch --yes --delete-keys "$PGP_KEY_FINGERPRINT"

From 95cb8ca4935e9e3ef82d692d82b73f811fa0ac96 Mon Sep 17 00:00:00 2001
From: Imran Remtulla <30463115+ImranR98@users.noreply.github.com>
Date: Fri, 6 Oct 2023 22:41:47 -0400
Subject: [PATCH 12/35] Update release.yml

---
 .github/workflows/release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index c57175b..127e952 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -22,7 +22,7 @@ jobs:
       - name: Temp
         run: |
           PGP_KEY_FINGERPRINT="${{ steps.import_pgp_key.outputs.fingerprint }}"
-          # export GPG_TTY=$(tty)
+          export GPG_TTY=$(tty)
           echo 'abc' > ./abc
           gpg --sign --detach-sig ./abc
           gpg --batch --yes --delete-secret-keys "$PGP_KEY_FINGERPRINT"

From e95230859efe381340bebf93bc7744d5fe8866e0 Mon Sep 17 00:00:00 2001
From: Imran Remtulla <30463115+ImranR98@users.noreply.github.com>
Date: Fri, 6 Oct 2023 22:43:41 -0400
Subject: [PATCH 13/35] Update release.yml

---
 .github/workflows/release.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 127e952..41b12c9 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -9,9 +9,9 @@ jobs:
 
     steps:
       
-      - uses: actions/checkout@v3
+      #- uses: actions/checkout@v3
         
-      - uses: subosito/flutter-action@v2
+      #- uses: subosito/flutter-action@v2
 
       - name: Import GPG key
         id: import_pgp_key
@@ -22,9 +22,9 @@ jobs:
       - name: Temp
         run: |
           PGP_KEY_FINGERPRINT="${{ steps.import_pgp_key.outputs.fingerprint }}"
-          export GPG_TTY=$(tty)
+          # export GPG_TTY=$(tty)
           echo 'abc' > ./abc
-          gpg --sign --detach-sig ./abc
+          gpg --batch --sign --detach-sig --pinentry-mode loopback ./abc
           gpg --batch --yes --delete-secret-keys "$PGP_KEY_FINGERPRINT"
           gpg --batch --yes --delete-keys "$PGP_KEY_FINGERPRINT"
 

From 827e2b161cbb1a92c79db36f50132de78cd16329 Mon Sep 17 00:00:00 2001
From: Imran Remtulla <30463115+ImranR98@users.noreply.github.com>
Date: Fri, 6 Oct 2023 22:45:20 -0400
Subject: [PATCH 14/35] Update release.yml

---
 .github/workflows/release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 41b12c9..fdcffeb 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -24,7 +24,7 @@ jobs:
           PGP_KEY_FINGERPRINT="${{ steps.import_pgp_key.outputs.fingerprint }}"
           # export GPG_TTY=$(tty)
           echo 'abc' > ./abc
-          gpg --batch --sign --detach-sig --pinentry-mode loopback ./abc
+          gpg --sign --detach-sig ./abc
           gpg --batch --yes --delete-secret-keys "$PGP_KEY_FINGERPRINT"
           gpg --batch --yes --delete-keys "$PGP_KEY_FINGERPRINT"
 

From 15a1f1e6e09f2baaac8b2a24de3405387cc1f4c2 Mon Sep 17 00:00:00 2001
From: Imran Remtulla <30463115+ImranR98@users.noreply.github.com>
Date: Fri, 6 Oct 2023 22:46:11 -0400
Subject: [PATCH 15/35] Update release.yml

---
 .github/workflows/release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index fdcffeb..faddc61 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -24,7 +24,7 @@ jobs:
           PGP_KEY_FINGERPRINT="${{ steps.import_pgp_key.outputs.fingerprint }}"
           # export GPG_TTY=$(tty)
           echo 'abc' > ./abc
-          gpg --sign --detach-sig ./abc
+          gpg --batch  --pinentry-mode loopback --passphrase "ABCDFML" --sign --detach-sig ./abc
           gpg --batch --yes --delete-secret-keys "$PGP_KEY_FINGERPRINT"
           gpg --batch --yes --delete-keys "$PGP_KEY_FINGERPRINT"
 

From 30a9e1ee4b360c7215be0f792fd94f6765e18ada Mon Sep 17 00:00:00 2001
From: Imran Remtulla <30463115+ImranR98@users.noreply.github.com>
Date: Fri, 6 Oct 2023 22:48:21 -0400
Subject: [PATCH 16/35] Update release.yml

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

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index faddc61..3dca8bc 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -18,6 +18,7 @@ jobs:
         uses: crazy-max/ghaction-import-gpg@v6
         with:
           gpg_private_key: ${{ secrets.PGP_KEY_BASE64 }}
+          passphrase: "ABCDFML"
 
       - name: Temp
         run: |

From 6c0459c2ae8e9a7a9ae5b18501eae70daf56dd05 Mon Sep 17 00:00:00 2001
From: Imran Remtulla <30463115+ImranR98@users.noreply.github.com>
Date: Fri, 6 Oct 2023 22:51:30 -0400
Subject: [PATCH 17/35] Update release.yml

---
 .github/workflows/release.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 3dca8bc..5699983 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -18,14 +18,16 @@ jobs:
         uses: crazy-max/ghaction-import-gpg@v6
         with:
           gpg_private_key: ${{ secrets.PGP_KEY_BASE64 }}
-          passphrase: "ABCDFML"
+          passphrase: ${{ secrets.PGP_PASSPHRASE }}
 
       - name: Temp
+        env:
+          PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
         run: |
           PGP_KEY_FINGERPRINT="${{ steps.import_pgp_key.outputs.fingerprint }}"
           # export GPG_TTY=$(tty)
           echo 'abc' > ./abc
-          gpg --batch  --pinentry-mode loopback --passphrase "ABCDFML" --sign --detach-sig ./abc
+          gpg --batch  --pinentry-mode loopback --passphrase "${PGP_PASSPHRASE}" --sign --detach-sig ./abc
           gpg --batch --yes --delete-secret-keys "$PGP_KEY_FINGERPRINT"
           gpg --batch --yes --delete-keys "$PGP_KEY_FINGERPRINT"
 

From 96fb97f4ef5993dc7c64410c9b8a9de2a3aab050 Mon Sep 17 00:00:00 2001
From: Imran Remtulla <30463115+ImranR98@users.noreply.github.com>
Date: Fri, 6 Oct 2023 22:53:13 -0400
Subject: [PATCH 18/35] Update release.yml

---
 .github/workflows/release.yml | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 5699983..3dda30e 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -20,17 +20,6 @@ jobs:
           gpg_private_key: ${{ secrets.PGP_KEY_BASE64 }}
           passphrase: ${{ secrets.PGP_PASSPHRASE }}
 
-      - name: Temp
-        env:
-          PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
-        run: |
-          PGP_KEY_FINGERPRINT="${{ steps.import_pgp_key.outputs.fingerprint }}"
-          # export GPG_TTY=$(tty)
-          echo 'abc' > ./abc
-          gpg --batch  --pinentry-mode loopback --passphrase "${PGP_PASSPHRASE}" --sign --detach-sig ./abc
-          gpg --batch --yes --delete-secret-keys "$PGP_KEY_FINGERPRINT"
-          gpg --batch --yes --delete-keys "$PGP_KEY_FINGERPRINT"
-
       - name: Build APKs
         run: |
           sed -i 's/signingConfig signingConfigs.release//g' android/app/build.gradle
@@ -40,6 +29,7 @@ jobs:
         env:
           KEYSTORE_BASE64: ${{ secrets.KEYSTORE_BASE64 }}
           KEYSTORE_PASS: ${{ secrets.KEYSTORE_PASS }}
+          PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
         run: |
           echo "${KEYSTORE_BASE64}" | base64 -d > apksign.keystore
           for apk in ./build/app/outputs/flutter-apk/*-release*.apk; do
@@ -47,7 +37,7 @@ jobs:
             mv "$apk" "$unsignedFn"
             ${ANDROID_HOME}/build-tools/30.0.2/apksigner sign --ks apksign.keystore --ks-pass env:KEYSTORE_PASS --out "${apk}" "${unsignedFn}"
             sha256sum ${apk} | cut -d " " -f 1 > "$apk".sha256
-            gpg --sign --detach-sig "$apk".sha256
+            gpg --batch  --pinentry-mode loopback --passphrase "${PGP_PASSPHRASE}" --sign --detach-sig "$apk".sha256
           done
           rm apksign.keystore
           PGP_KEY_FINGERPRINT="${{ steps.import_pgp_key.outputs.fingerprint }}"

From ddb50940ce3881bd51e3a838636f6f871aea741a Mon Sep 17 00:00:00 2001
From: Imran Remtulla <30463115+ImranR98@users.noreply.github.com>
Date: Fri, 6 Oct 2023 22:55:50 -0400
Subject: [PATCH 19/35] Update release.yml

---
 .github/workflows/release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 3dda30e..dd68aed 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -57,7 +57,7 @@ jobs:
       - name: Create Release And Upload APKs
         uses: ncipollo/release-action@v1
         with:
-          token: ${{ secrets.GITHUB_ACCESS_TOKEN }}
+          token: ${{ secrets.GH_ACCESS_TOKEN }}
           tag: "${{ steps.extract_version.outputs.tag }}"
           prerelease: "${{ steps.extract_version.outputs.beta }}"
           artifacts: ./build/app/outputs/flutter-apk/*-release*.apk*

From 818dc230891920d1a982f40d9e008af0befbabab Mon Sep 17 00:00:00 2001
From: Imran Remtulla <30463115+ImranR98@users.noreply.github.com>
Date: Fri, 6 Oct 2023 22:55:59 -0400
Subject: [PATCH 20/35] Update release.yml

---
 .github/workflows/release.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index dd68aed..1e7b6e0 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -9,9 +9,9 @@ jobs:
 
     steps:
       
-      #- uses: actions/checkout@v3
+      - uses: actions/checkout@v3
         
-      #- uses: subosito/flutter-action@v2
+      - uses: subosito/flutter-action@v2
 
       - name: Import GPG key
         id: import_pgp_key

From 238d43f9162a5e041e90ccecdacf8bf16139c913 Mon Sep 17 00:00:00 2001
From: Imran Remtulla <30463115+ImranR98@users.noreply.github.com>
Date: Fri, 6 Oct 2023 23:18:25 -0400
Subject: [PATCH 21/35] Update release.yml

---
 .github/workflows/release.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 1e7b6e0..6d478be 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -28,14 +28,13 @@ jobs:
       - name: Sign APKs
         env:
           KEYSTORE_BASE64: ${{ secrets.KEYSTORE_BASE64 }}
-          KEYSTORE_PASS: ${{ secrets.KEYSTORE_PASS }}
           PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
         run: |
           echo "${KEYSTORE_BASE64}" | base64 -d > apksign.keystore
           for apk in ./build/app/outputs/flutter-apk/*-release*.apk; do
             unsignedFn=${apk/-release/-unsigned}
             mv "$apk" "$unsignedFn"
-            ${ANDROID_HOME}/build-tools/30.0.2/apksigner sign --ks apksign.keystore --ks-pass env:KEYSTORE_PASS --out "${apk}" "${unsignedFn}"
+            ${ANDROID_HOME}/build-tools/30.0.2/apksigner sign --ks apksign.keystore --out "${apk}" "${unsignedFn}"
             sha256sum ${apk} | cut -d " " -f 1 > "$apk".sha256
             gpg --batch  --pinentry-mode loopback --passphrase "${PGP_PASSPHRASE}" --sign --detach-sig "$apk".sha256
           done

From 5c562a6bdb143d5f274b57ffaa562ccdd486a93e Mon Sep 17 00:00:00 2001
From: Imran Remtulla <30463115+ImranR98@users.noreply.github.com>
Date: Fri, 6 Oct 2023 23:45:00 -0400
Subject: [PATCH 22/35] Update release.yml

---
 .github/workflows/release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 6d478be..a85ec7b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -34,7 +34,7 @@ jobs:
           for apk in ./build/app/outputs/flutter-apk/*-release*.apk; do
             unsignedFn=${apk/-release/-unsigned}
             mv "$apk" "$unsignedFn"
-            ${ANDROID_HOME}/build-tools/30.0.2/apksigner sign --ks apksign.keystore --out "${apk}" "${unsignedFn}"
+            ${ANDROID_HOME}/build-tools/30.0.2/apksigner sign --ks apksign.keystore --ks-pass "" --out "${apk}" "${unsignedFn}"
             sha256sum ${apk} | cut -d " " -f 1 > "$apk".sha256
             gpg --batch  --pinentry-mode loopback --passphrase "${PGP_PASSPHRASE}" --sign --detach-sig "$apk".sha256
           done

From b38f6d058122e9702659c21be5fea07f8c2464a0 Mon Sep 17 00:00:00 2001
From: Imran Remtulla <30463115+ImranR98@users.noreply.github.com>
Date: Fri, 6 Oct 2023 23:58:33 -0400
Subject: [PATCH 23/35] Update release.yml

---
 .github/workflows/release.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index a85ec7b..9b1f7cf 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -28,13 +28,14 @@ jobs:
       - name: Sign APKs
         env:
           KEYSTORE_BASE64: ${{ secrets.KEYSTORE_BASE64 }}
+          KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
           PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
         run: |
           echo "${KEYSTORE_BASE64}" | base64 -d > apksign.keystore
           for apk in ./build/app/outputs/flutter-apk/*-release*.apk; do
             unsignedFn=${apk/-release/-unsigned}
             mv "$apk" "$unsignedFn"
-            ${ANDROID_HOME}/build-tools/30.0.2/apksigner sign --ks apksign.keystore --ks-pass "" --out "${apk}" "${unsignedFn}"
+            ${ANDROID_HOME}/build-tools/30.0.2/apksigner sign --ks apksign.keystore --ks-pass "${KEYSTORE_PASSWORD}" --out "${apk}" "${unsignedFn}"
             sha256sum ${apk} | cut -d " " -f 1 > "$apk".sha256
             gpg --batch  --pinentry-mode loopback --passphrase "${PGP_PASSPHRASE}" --sign --detach-sig "$apk".sha256
           done

From b40a4dd243b5bccfe2bd71b65797f35c09310979 Mon Sep 17 00:00:00 2001
From: Imran Remtulla <30463115+ImranR98@users.noreply.github.com>
Date: Sat, 7 Oct 2023 00:09:18 -0400
Subject: [PATCH 24/35] Update release.yml

---
 .github/workflows/release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 9b1f7cf..b0ca8a0 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -35,7 +35,7 @@ jobs:
           for apk in ./build/app/outputs/flutter-apk/*-release*.apk; do
             unsignedFn=${apk/-release/-unsigned}
             mv "$apk" "$unsignedFn"
-            ${ANDROID_HOME}/build-tools/30.0.2/apksigner sign --ks apksign.keystore --ks-pass "${KEYSTORE_PASSWORD}" --out "${apk}" "${unsignedFn}"
+            ${ANDROID_HOME}/build-tools/30.0.2/apksigner sign --ks apksign.keystore --ks-pass pass:"${KEYSTORE_PASSWORD}" --out "${apk}" "${unsignedFn}"
             sha256sum ${apk} | cut -d " " -f 1 > "$apk".sha256
             gpg --batch  --pinentry-mode loopback --passphrase "${PGP_PASSPHRASE}" --sign --detach-sig "$apk".sha256
           done

From 290a78acb55113dd578dde2abd4f4a2ed75332e4 Mon Sep 17 00:00:00 2001
From: Imran Remtulla <30463115+ImranR98@users.noreply.github.com>
Date: Sat, 7 Oct 2023 00:30:09 -0400
Subject: [PATCH 25/35] Update release.yml

---
 .github/workflows/release.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index b0ca8a0..f63320a 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -36,8 +36,9 @@ jobs:
             unsignedFn=${apk/-release/-unsigned}
             mv "$apk" "$unsignedFn"
             ${ANDROID_HOME}/build-tools/30.0.2/apksigner sign --ks apksign.keystore --ks-pass pass:"${KEYSTORE_PASSWORD}" --out "${apk}" "${unsignedFn}"
-            sha256sum ${apk} | cut -d " " -f 1 > "$apk".sha256
-            gpg --batch  --pinentry-mode loopback --passphrase "${PGP_PASSPHRASE}" --sign --detach-sig "$apk".sha256
+            ls -l
+            # sha256sum ${apk} | cut -d " " -f 1 > "$apk".sha256
+            gpg --batch  --pinentry-mode loopback --passphrase "${PGP_PASSPHRASE}" --sign --detach-sig "$apk".sha1
           done
           rm apksign.keystore
           PGP_KEY_FINGERPRINT="${{ steps.import_pgp_key.outputs.fingerprint }}"

From e314717a3e59e409b27944ce1659662d44a5451d Mon Sep 17 00:00:00 2001
From: Imran Remtulla <30463115+ImranR98@users.noreply.github.com>
Date: Sat, 7 Oct 2023 00:33:50 -0400
Subject: [PATCH 26/35] Update release.yml

---
 .github/workflows/release.yml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f63320a..e817961 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,4 +1,4 @@
-name: Release (Manual/Draft)
+name: Release (as Draft)
 
 on:
   workflow_dispatch:
@@ -10,7 +10,6 @@ jobs:
     steps:
       
       - uses: actions/checkout@v3
-        
       - uses: subosito/flutter-action@v2
 
       - name: Import GPG key
@@ -54,6 +53,12 @@ jobs:
            echo "::set-output name=tag::$TAG"
            if [ -n "$(echo $TAG | grep -oP '\-beta$')" ]; then BETA=true; else BETA=false; fi
            echo "::set-output name=beta::$BETA"
+
+      - name: Create Tag
+        uses: laputansoft/github-tag-action@v4.6
+        with:
+          github_token: ${{ secrets.GH_ACCESS_TOKEN }}
+          tag: "${{ steps.extract_version.outputs.tag }}"
       
       - name: Create Release And Upload APKs
         uses: ncipollo/release-action@v1

From abfec51964ef1b03cac7040a99af3fcaf2a98702 Mon Sep 17 00:00:00 2001
From: Imran Remtulla <30463115+ImranR98@users.noreply.github.com>
Date: Sat, 7 Oct 2023 00:40:34 -0400
Subject: [PATCH 27/35] Update release.yml

---
 .github/workflows/release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index e817961..b0450f8 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -35,7 +35,7 @@ jobs:
             unsignedFn=${apk/-release/-unsigned}
             mv "$apk" "$unsignedFn"
             ${ANDROID_HOME}/build-tools/30.0.2/apksigner sign --ks apksign.keystore --ks-pass pass:"${KEYSTORE_PASSWORD}" --out "${apk}" "${unsignedFn}"
-            ls -l
+            ls -l ./build/app/outputs/flutter-apk/
             # sha256sum ${apk} | cut -d " " -f 1 > "$apk".sha256
             gpg --batch  --pinentry-mode loopback --passphrase "${PGP_PASSPHRASE}" --sign --detach-sig "$apk".sha1
           done

From 2cb750a7b045a8c523803174b6e15b5fd8d7321b Mon Sep 17 00:00:00 2001
From: Imran Remtulla <30463115+ImranR98@users.noreply.github.com>
Date: Sat, 7 Oct 2023 00:56:27 -0400
Subject: [PATCH 28/35] Update release.yml

---
 .github/workflows/release.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index b0450f8..ce5f6a2 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -23,6 +23,8 @@ jobs:
         run: |
           sed -i 's/signingConfig signingConfigs.release//g' android/app/build.gradle
           flutter build apk && flutter build apk --split-per-abi
+          rm ./build/app/outputs/flutter-apk/*.sha1
+          ls -l ./build/app/outputs/flutter-apk/
         
       - name: Sign APKs
         env:
@@ -35,9 +37,9 @@ jobs:
             unsignedFn=${apk/-release/-unsigned}
             mv "$apk" "$unsignedFn"
             ${ANDROID_HOME}/build-tools/30.0.2/apksigner sign --ks apksign.keystore --ks-pass pass:"${KEYSTORE_PASSWORD}" --out "${apk}" "${unsignedFn}"
-            ls -l ./build/app/outputs/flutter-apk/
-            # sha256sum ${apk} | cut -d " " -f 1 > "$apk".sha256
-            gpg --batch  --pinentry-mode loopback --passphrase "${PGP_PASSPHRASE}" --sign --detach-sig "$apk".sha1
+            rm "$apk".idsig
+            sha256sum ${apk} | cut -d " " -f 1 > "$apk".sha256
+            gpg --batch  --pinentry-mode loopback --passphrase "${PGP_PASSPHRASE}" --sign --detach-sig "$apk".sha256
           done
           rm apksign.keystore
           PGP_KEY_FINGERPRINT="${{ steps.import_pgp_key.outputs.fingerprint }}"

From c75416f9be32539c3c3f7c9768247b7461031a29 Mon Sep 17 00:00:00 2001
From: Imran Remtulla <30463115+ImranR98@users.noreply.github.com>
Date: Sat, 7 Oct 2023 01:02:53 -0400
Subject: [PATCH 29/35] Update release.yml

---
 .github/workflows/release.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index ce5f6a2..cbdf064 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -37,7 +37,6 @@ jobs:
             unsignedFn=${apk/-release/-unsigned}
             mv "$apk" "$unsignedFn"
             ${ANDROID_HOME}/build-tools/30.0.2/apksigner sign --ks apksign.keystore --ks-pass pass:"${KEYSTORE_PASSWORD}" --out "${apk}" "${unsignedFn}"
-            rm "$apk".idsig
             sha256sum ${apk} | cut -d " " -f 1 > "$apk".sha256
             gpg --batch  --pinentry-mode loopback --passphrase "${PGP_PASSPHRASE}" --sign --detach-sig "$apk".sha256
           done

From 9bbff1f4360a3e0c855c4e711187f9b97206cf37 Mon Sep 17 00:00:00 2001
From: Imran Remtulla <30463115+ImranR98@users.noreply.github.com>
Date: Sat, 7 Oct 2023 01:08:43 -0400
Subject: [PATCH 30/35] Update release.yml

---
 .github/workflows/release.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index cbdf064..39def93 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -56,10 +56,10 @@ jobs:
            echo "::set-output name=beta::$BETA"
 
       - name: Create Tag
-        uses: laputansoft/github-tag-action@v4.6
+        uses: mathieudutour/github-tag-action@v6.1
         with:
           github_token: ${{ secrets.GH_ACCESS_TOKEN }}
-          tag: "${{ steps.extract_version.outputs.tag }}"
+          custom_tag: "${{ steps.extract_version.outputs.tag }}"
       
       - name: Create Release And Upload APKs
         uses: ncipollo/release-action@v1

From 2c006748351aa4e1a1586d88d13256357263c26d Mon Sep 17 00:00:00 2001
From: Imran Remtulla <30463115+ImranR98@users.noreply.github.com>
Date: Sat, 7 Oct 2023 01:20:03 -0400
Subject: [PATCH 31/35] Update release.yml

---
 .github/workflows/release.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 39def93..3886b94 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -60,6 +60,7 @@ jobs:
         with:
           github_token: ${{ secrets.GH_ACCESS_TOKEN }}
           custom_tag: "${{ steps.extract_version.outputs.tag }}"
+          tag_prefix: ""
       
       - name: Create Release And Upload APKs
         uses: ncipollo/release-action@v1
@@ -68,6 +69,7 @@ jobs:
           tag: "${{ steps.extract_version.outputs.tag }}"
           prerelease: "${{ steps.extract_version.outputs.beta }}"
           artifacts: ./build/app/outputs/flutter-apk/*-release*.apk*
+          body: ${{ steps.tag_version.outputs.changelog }}
           draft: true
                   
       - name: Archive Reports For Job

From a5b2d06742bba73ebb7ce9f3d865725ae44d717a Mon Sep 17 00:00:00 2001
From: Imran Remtulla <30463115+ImranR98@users.noreply.github.com>
Date: Sat, 7 Oct 2023 01:33:34 -0400
Subject: [PATCH 32/35] Update release.yml

---
 .github/workflows/release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 3886b94..fda3b76 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -69,7 +69,7 @@ jobs:
           tag: "${{ steps.extract_version.outputs.tag }}"
           prerelease: "${{ steps.extract_version.outputs.beta }}"
           artifacts: ./build/app/outputs/flutter-apk/*-release*.apk*
-          body: ${{ steps.tag_version.outputs.changelog }}
+          generateReleaseNotes: true
           draft: true
                   
       - name: Archive Reports For Job

From 811bc6434b019ffddbf4ba296c5981a3fa64418f Mon Sep 17 00:00:00 2001
From: Imran Remtulla <30463115+ImranR98@users.noreply.github.com>
Date: Sat, 7 Oct 2023 02:00:13 -0400
Subject: [PATCH 33/35] Update release.yml

---
 .github/workflows/release.yml | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index fda3b76..2235561 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -42,18 +42,16 @@ jobs:
           done
           rm apksign.keystore
           PGP_KEY_FINGERPRINT="${{ steps.import_pgp_key.outputs.fingerprint }}"
-          gpg --batch --yes --delete-secret-keys "$PGP_KEY_FINGERPRINT"
-          gpg --batch --yes --delete-keys "$PGP_KEY_FINGERPRINT"
         
       - name: Extract Version
         id: extract_version      
         run: |
            VERSION=$(grep -oP "currentVersion = '\K[^']+" lib/main.dart)
-           echo "::set-output name=version::$VERSION"
+           echo "version=$VERSION" >> $GITHUB_OUTPUT
            TAG=$(grep -oP "'.*\\\$currentVersion.*'" lib/main.dart | head -c -2 | tail -c +2 | sed "s/\$currentVersion/$VERSION/g")
-           echo "::set-output name=tag::$TAG"
+           echo "tag=$TAG" >> $GITHUB_OUTPUT
            if [ -n "$(echo $TAG | grep -oP '\-beta$')" ]; then BETA=true; else BETA=false; fi
-           echo "::set-output name=beta::$BETA"
+           echo "beta=$BETA" >> $GITHUB_OUTPUT
 
       - name: Create Tag
         uses: mathieudutour/github-tag-action@v6.1
@@ -71,10 +69,3 @@ jobs:
           artifacts: ./build/app/outputs/flutter-apk/*-release*.apk*
           generateReleaseNotes: true
           draft: true
-                  
-      - name: Archive Reports For Job
-        uses: actions/upload-artifact@v3
-        with:
-          name: reports
-          path: '*/build/reports'
-        if: ${{ always() }}

From 1e009e2211f3b6e2cdcff45d99e987fa4f1ef5f9 Mon Sep 17 00:00:00 2001
From: Imran Remtulla <30463115+ImranR98@users.noreply.github.com>
Date: Sat, 7 Oct 2023 02:03:18 -0400
Subject: [PATCH 34/35] Update release.yml

---
 .github/workflows/release.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 2235561..7ac5e34 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,4 +1,4 @@
-name: Release (as Draft)
+name: Build and Release
 
 on:
   workflow_dispatch:
@@ -68,4 +68,3 @@ jobs:
           prerelease: "${{ steps.extract_version.outputs.beta }}"
           artifacts: ./build/app/outputs/flutter-apk/*-release*.apk*
           generateReleaseNotes: true
-          draft: true

From 5aabcccfd40580391bd0f945e7f821b7ad24527a Mon Sep 17 00:00:00 2001
From: John Betaro <114379310+JohnBetaro@users.noreply.github.com>
Date: Sat, 7 Oct 2023 09:53:34 +0100
Subject: [PATCH 35/35] Update fdroid.dart

---
 lib/app_sources/fdroid.dart | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/app_sources/fdroid.dart b/lib/app_sources/fdroid.dart
index 1201062..c7b2dda 100644
--- a/lib/app_sources/fdroid.dart
+++ b/lib/app_sources/fdroid.dart
@@ -11,6 +11,7 @@ class FDroid extends AppSource {
   FDroid() {
     host = 'f-droid.org';
     name = tr('fdroid');
+    naiveStandardVersionDetection = true;
     canSearch = true;
     additionalSourceAppSpecificSettingFormItems = [
       [