From 901fe201cac1724e6591f52b3a32bff4b643cbb1 Mon Sep 17 00:00:00 2001
From: KoalaSat <yv1vtrul@duck.com>
Date: Sun, 10 Mar 2024 22:53:39 +0100
Subject: [PATCH 01/13] Fix

---
 .github/workflows/android-build.yml | 5 +++++
 .github/workflows/release.yml       | 5 -----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/android-build.yml b/.github/workflows/android-build.yml
index 936cead4..ff56a8a9 100644
--- a/.github/workflows/android-build.yml
+++ b/.github/workflows/android-build.yml
@@ -7,6 +7,11 @@ on:
   pull_request:
     branches: [ "main" ]
 
+env:
+  KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
+  KEY_PASS: ${{ secrets.KEY_PASS }}
+  KEY_STORE_PASS: ${{ secrets.KEY_STORE_PASS }}
+
 jobs:
   build-android:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f87ce06e..13720ce0 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -9,11 +9,6 @@ on:
 jobs:
   android-build:
     uses: KoalaSat/nostros/.github/workflows/android-build.yml@main
-    with:
-      env:
-        KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
-        KEY_PASS: ${{ secrets.KEY_PASS }}
-        KEY_STORE_PASS: ${{ secrets.KEY_STORE_PASS }}
   release:
     needs: [android-build]
     runs-on: ubuntu-latest

From bd4ab2499686bdf07536812e09a3d3b01074957f Mon Sep 17 00:00:00 2001
From: KoalaSat <yv1vtrul@duck.com>
Date: Mon, 11 Mar 2024 00:18:31 +0100
Subject: [PATCH 02/13] Fix

---
 .github/workflows/android-build.yml | 19 +++++++++++--------
 android/app/build.gradle            | 19 +++++++++----------
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/android-build.yml b/.github/workflows/android-build.yml
index ff56a8a9..fceff8d4 100644
--- a/.github/workflows/android-build.yml
+++ b/.github/workflows/android-build.yml
@@ -7,11 +7,6 @@ on:
   pull_request:
     branches: [ "main" ]
 
-env:
-  KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
-  KEY_PASS: ${{ secrets.KEY_PASS }}
-  KEY_STORE_PASS: ${{ secrets.KEY_STORE_PASS }}
-
 jobs:
   build-android:
     runs-on: ubuntu-latest
@@ -31,13 +26,21 @@ jobs:
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2
 
-      - name: Generating one-time APK signature key
-        run: keytool -genkey -v -keystore keystore.jks -alias Nostros -keyalg RSA -keysize 2048 -validity 10000 -storepass ${{ secrets.KEY_STORE_PASS }} -keypass ${{ secrets.KEY_PASS }} -dname "cn=Nostros, ou=Actions, o=Nostros, c=GitHub"
+      - name: Decode Keystore
+        id: decode_keystore
+        uses: timheuer/base64-to-file@v1
+        with:
+          fileName: 'keystore/nostros_keystore.jks'
+          encodedString: ${{ secrets.KEYSTORE }}
 
       - name: 'Build Android Release'
         run: |
           cd android
-          ./gradlew assembleRelease
+          ./gradlew app:bundleRelease
+        env:
+          KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
+          KEY_PASS: ${{ secrets.KEY_PASS }}
+          KEY_STORE_PASS: ${{ secrets.KEY_STORE_PASS }}
 
       - name: 'Check for non-FOSS libraries'
         run: |
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 56466183..a66080f3 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -128,19 +128,18 @@ android {
         }
 
         release {
-            // We can leave these in environment variables
-            storeFile file('../../keystore.jks')
-            keyAlias System.getenv("KEY_ALIAS")
+            def tmpFilePath = System.getProperty("user.home") + "/work/_temp/keystore/"
+            def allFilesFromDir = new File(tmpFilePath).listFiles()
+
+            if (allFilesFromDir != null) {
+                def keystoreFile = allFilesFromDir.first()
+                keystoreFile.renameTo("keystore/nostros_keystore.jks")
+            }
 
-            // These two lines make gradle believe that the signingConfigs
-            // section is complete. Without them, tasks like installRelease
-            // will not be available!
+            storeFile = file("keystore/nostros_keystore.jks")
+            keyAlias System.getenv("KEY_ALIAS")
             storePassword System.getenv("KEY_STORE_PASS")
             keyPassword System.getenv("KEY_PASS")
-
-            enableV1Signing true
-            enableV2Signing true
-            enableV3Signing true
         }
     }
     buildTypes {

From 97f7e4c1ab13dfe5a814eb7d4d75b639db9b47e0 Mon Sep 17 00:00:00 2001
From: KoalaSat <yv1vtrul@duck.com>
Date: Mon, 11 Mar 2024 00:33:30 +0100
Subject: [PATCH 03/13] Fix

---
 .github/workflows/android-build.yml |  5 +++--
 android/app/build.gradle            | 10 +---------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/android-build.yml b/.github/workflows/android-build.yml
index fceff8d4..a79b1686 100644
--- a/.github/workflows/android-build.yml
+++ b/.github/workflows/android-build.yml
@@ -28,9 +28,10 @@ jobs:
 
       - name: Decode Keystore
         id: decode_keystore
-        uses: timheuer/base64-to-file@v1
+        uses: timheuer/base64-to-file@v1.2
         with:
-          fileName: 'keystore/nostros_keystore.jks'
+          fileName: 'nostros_keystore.jks'
+          fileDir: './'
           encodedString: ${{ secrets.KEYSTORE }}
 
       - name: 'Build Android Release'
diff --git a/android/app/build.gradle b/android/app/build.gradle
index a66080f3..515f2dab 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -128,15 +128,7 @@ android {
         }
 
         release {
-            def tmpFilePath = System.getProperty("user.home") + "/work/_temp/keystore/"
-            def allFilesFromDir = new File(tmpFilePath).listFiles()
-
-            if (allFilesFromDir != null) {
-                def keystoreFile = allFilesFromDir.first()
-                keystoreFile.renameTo("keystore/nostros_keystore.jks")
-            }
-
-            storeFile = file("keystore/nostros_keystore.jks")
+            storeFile = file("../../nostros_keystore.jks")
             keyAlias System.getenv("KEY_ALIAS")
             storePassword System.getenv("KEY_STORE_PASS")
             keyPassword System.getenv("KEY_PASS")

From 2e154e7c995493a8d82553ce37369a9d89e7c1fc Mon Sep 17 00:00:00 2001
From: KoalaSat <yv1vtrul@duck.com>
Date: Mon, 11 Mar 2024 00:42:04 +0100
Subject: [PATCH 04/13] Trigger Build


From d008e2e26b987715f43d758e9abd82f49d832632 Mon Sep 17 00:00:00 2001
From: KoalaSat <yv1vtrul@duck.com>
Date: Mon, 11 Mar 2024 00:51:20 +0100
Subject: [PATCH 05/13] Fix

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

diff --git a/.github/workflows/android-build.yml b/.github/workflows/android-build.yml
index a79b1686..a49ce5b0 100644
--- a/.github/workflows/android-build.yml
+++ b/.github/workflows/android-build.yml
@@ -37,7 +37,7 @@ jobs:
       - name: 'Build Android Release'
         run: |
           cd android
-          ./gradlew app:bundleRelease
+          ./gradlew assembleRelease
         env:
           KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
           KEY_PASS: ${{ secrets.KEY_PASS }}

From 08535a0163208f29aaeaf0244fdaf8da1e7825d2 Mon Sep 17 00:00:00 2001
From: KoalaSat <yv1vtrul@duck.com>
Date: Tue, 12 Mar 2024 13:57:30 +0100
Subject: [PATCH 06/13] Fix

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

diff --git a/.github/workflows/android-build.yml b/.github/workflows/android-build.yml
index a49ce5b0..eb98a8a5 100644
--- a/.github/workflows/android-build.yml
+++ b/.github/workflows/android-build.yml
@@ -37,6 +37,7 @@ jobs:
       - name: 'Build Android Release'
         run: |
           cd android
+          echo $KEY_ALIAS
           ./gradlew assembleRelease
         env:
           KEY_ALIAS: ${{ secrets.KEY_ALIAS }}

From b7db8ab79e1caa7a854185ad33c5d02b24a1ab14 Mon Sep 17 00:00:00 2001
From: KoalaSat <yv1vtrul@duck.com>
Date: Tue, 12 Mar 2024 14:00:09 +0100
Subject: [PATCH 07/13] Fix

---
 android/app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 515f2dab..ff81d260 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -128,7 +128,7 @@ android {
         }
 
         release {
-            storeFile = file("../../nostros_keystore.jks")
+            storeFile file("../../nostros_keystore.jks")
             keyAlias System.getenv("KEY_ALIAS")
             storePassword System.getenv("KEY_STORE_PASS")
             keyPassword System.getenv("KEY_PASS")

From 0868c8ffa9181799b80c93e5d511701e0cb5e553 Mon Sep 17 00:00:00 2001
From: KoalaSat <yv1vtrul@duck.com>
Date: Tue, 12 Mar 2024 16:27:45 +0100
Subject: [PATCH 08/13] Fix

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

diff --git a/.github/workflows/android-build.yml b/.github/workflows/android-build.yml
index eb98a8a5..28c81df0 100644
--- a/.github/workflows/android-build.yml
+++ b/.github/workflows/android-build.yml
@@ -37,7 +37,7 @@ jobs:
       - name: 'Build Android Release'
         run: |
           cd android
-          echo $KEY_ALIAS
+          echo "1+++$KEY_ALIAS"
           ./gradlew assembleRelease
         env:
           KEY_ALIAS: ${{ secrets.KEY_ALIAS }}

From 62d9cab286fe1dc59a2ea6eaeba29a00af26544b Mon Sep 17 00:00:00 2001
From: KoalaSat <yv1vtrul@duck.com>
Date: Tue, 12 Mar 2024 16:31:25 +0100
Subject: [PATCH 09/13] Fix

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

diff --git a/.github/workflows/android-build.yml b/.github/workflows/android-build.yml
index 28c81df0..a49ce5b0 100644
--- a/.github/workflows/android-build.yml
+++ b/.github/workflows/android-build.yml
@@ -37,7 +37,6 @@ jobs:
       - name: 'Build Android Release'
         run: |
           cd android
-          echo "1+++$KEY_ALIAS"
           ./gradlew assembleRelease
         env:
           KEY_ALIAS: ${{ secrets.KEY_ALIAS }}

From b23825589d6441428164638539dddf1ad02f7b3c Mon Sep 17 00:00:00 2001
From: KoalaSat <yv1vtrul@duck.com>
Date: Tue, 12 Mar 2024 16:32:35 +0100
Subject: [PATCH 10/13] Fix

---
 .gitignore               | 2 --
 android/app/build.gradle | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index d7153252..afb22dcf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,8 +31,6 @@ local.properties
 *.iml
 *.hprof
 .cxx/
-*.keystore
-!debug.keystore
 
 # node.js
 #
diff --git a/android/app/build.gradle b/android/app/build.gradle
index ff81d260..524ff826 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -128,7 +128,7 @@ android {
         }
 
         release {
-            storeFile file("../../nostros_keystore.jks")
+            storeFile file("nostros_keystore.jks")
             keyAlias System.getenv("KEY_ALIAS")
             storePassword System.getenv("KEY_STORE_PASS")
             keyPassword System.getenv("KEY_PASS")

From 88a849e0aedd15a814dcb6a1b88a1a2639774fc7 Mon Sep 17 00:00:00 2001
From: KoalaSat <yv1vtrul@duck.com>
Date: Tue, 12 Mar 2024 17:18:07 +0100
Subject: [PATCH 11/13] Fix

---
 android/app/build.gradle |   2 +-
 android/app/keystore.jks | Bin 0 -> 2532 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 android/app/keystore.jks

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 524ff826..6ed796a3 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -128,7 +128,7 @@ android {
         }
 
         release {
-            storeFile file("nostros_keystore.jks")
+            storeFile file("keystore.jks")
             keyAlias System.getenv("KEY_ALIAS")
             storePassword System.getenv("KEY_STORE_PASS")
             keyPassword System.getenv("KEY_PASS")
diff --git a/android/app/keystore.jks b/android/app/keystore.jks
new file mode 100644
index 0000000000000000000000000000000000000000..b706689a19e3567cea54184b3e892618f352d955
GIT binary patch
literal 2532
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
Q{SLY*vrs5L`>&JzC;V$@OaK4?

literal 0
HcmV?d00001


From 42e9b0dad9424fac99d17f8546fdea7f7ccb3c97 Mon Sep 17 00:00:00 2001
From: KoalaSat <yv1vtrul@duck.com>
Date: Tue, 12 Mar 2024 17:31:39 +0100
Subject: [PATCH 12/13] Trigger Build


From 741e416e7f276a68049eee02036e076309bd20b1 Mon Sep 17 00:00:00 2001
From: KoalaSat <yv1vtrul@duck.com>
Date: Tue, 12 Mar 2024 17:43:47 +0100
Subject: [PATCH 13/13] Fix

---
 .github/workflows/android-build.yml | 2 +-
 android/app/build.gradle            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/android-build.yml b/.github/workflows/android-build.yml
index a49ce5b0..3f7db85d 100644
--- a/.github/workflows/android-build.yml
+++ b/.github/workflows/android-build.yml
@@ -30,7 +30,7 @@ jobs:
         id: decode_keystore
         uses: timheuer/base64-to-file@v1.2
         with:
-          fileName: 'nostros_keystore.jks'
+          fileName: 'keystore.jks'
           fileDir: './'
           encodedString: ${{ secrets.KEYSTORE }}
 
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 6ed796a3..4198a6af 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -128,7 +128,7 @@ android {
         }
 
         release {
-            storeFile file("keystore.jks")
+            storeFile file("../../keystore.jks")
             keyAlias System.getenv("KEY_ALIAS")
             storePassword System.getenv("KEY_STORE_PASS")
             keyPassword System.getenv("KEY_PASS")