From 7191313ce54ed76adc6d7803f91034e9dc5874c6 Mon Sep 17 00:00:00 2001
From: bxdxnn <267911624+bxdxnn@users.noreply.github.com>
Date: Sat, 12 Sep 2026 18:10:53 +0000
Subject: [PATCH] Allow changing keystore path

---
 app/build.gradle.kts  | 31 +++++++++++++++++++++++--------
 docs/nightly_build.md |  1 +
 gradle.properties     |  1 +
 3 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index a297ea7702..84eb43fc5f 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -38,6 +38,12 @@ plugins {
     // alias(libs.plugins.gms.google.services)
 }
 
+fun signingValue(envName: String, propertyName: String): String? =
+    providers.environmentVariable(envName)
+        .orElse(providers.gradleProperty(propertyName))
+        .orNull
+        ?.takeIf { it.isNotBlank() }
+
 android {
     namespace = "io.element.android.x"
 
@@ -88,13 +94,22 @@ android {
             storePassword = "android"
         }
         register("nightly") {
-            keyAlias = System.getenv("ELEMENT_ANDROID_NIGHTLY_KEYID")
-                ?: project.property("signing.element.nightly.keyId") as? String?
-            keyPassword = System.getenv("ELEMENT_ANDROID_NIGHTLY_KEYPASSWORD")
-                ?: project.property("signing.element.nightly.keyPassword") as? String?
-            storeFile = file("./signature/nightly.keystore")
-            storePassword = System.getenv("ELEMENT_ANDROID_NIGHTLY_STOREPASSWORD")
-                ?: project.property("signing.element.nightly.storePassword") as? String?
+            keyAlias = signingValue("ELEMENT_ANDROID_NIGHTLY_KEYID", "signing.element.nightly.keyId")
+            keyPassword = signingValue("ELEMENT_ANDROID_NIGHTLY_KEYPASSWORD", "signing.element.nightly.keyPassword")
+            storeFile = file(
+                signingValue("ELEMENT_ANDROID_NIGHTLY_STOREFILE", "signing.element.nightly.storeFile")
+                    ?: "./signature/nightly.keystore"
+            )
+            storePassword = signingValue("ELEMENT_ANDROID_NIGHTLY_STOREPASSWORD", "signing.element.nightly.storePassword")
+        }
+        val releaseStoreFile = signingValue("ELEMENT_ANDROID_RELEASE_STOREFILE", "signing.element.release.storeFile")
+        if (releaseStoreFile != null) {
+            register("release") {
+                keyAlias = signingValue("ELEMENT_ANDROID_RELEASE_KEYID", "signing.element.release.keyId")
+                keyPassword = signingValue("ELEMENT_ANDROID_RELEASE_KEYPASSWORD", "signing.element.release.keyPassword")
+                storeFile = file(releaseStoreFile)
+                storePassword = signingValue("ELEMENT_ANDROID_RELEASE_STOREPASSWORD", "signing.element.release.storePassword")
+            }
         }
     }
 
@@ -122,7 +137,7 @@ android {
                 "login_redirect_scheme",
                 oAuthRedirectSchemeBase,
             )
-            signingConfig = signingConfigs.getByName("debug")
+            signingConfig = signingConfigs.findByName("release") ?: signingConfigs.getByName("debug")
 
             optimization {
                 enable = true
diff --git a/docs/nightly_build.md b/docs/nightly_build.md
index 3a3345d662..b52b266612 100644
--- a/docs/nightly_build.md
+++ b/docs/nightly_build.md
@@ -27,6 +27,7 @@ Click on this link and follow the instruction: [https://appdistribution.firebase
 Nightly build can be built manually from your computer. You will need to retrieved some secrets from Passbolt and add them to your file `~/.gradle/gradle.properties`:
 
 ```
+signing.element.nightly.storeFile=VALUE_FROM_PASSBOLT
 signing.element.nightly.storePassword=VALUE_FROM_PASSBOLT
 signing.element.nightly.keyId=VALUE_FROM_PASSBOLT
 signing.element.nightly.keyPassword=VALUE_FROM_PASSBOLT
diff --git a/gradle.properties b/gradle.properties
index 4323d20107..813b2173a4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -39,6 +39,7 @@ org.gradle.configuration-cache.parallel=true
 kotlin.incremental=true
 
 # Dummy values for signing secrets / nightly
+signing.element.nightly.storeFile=./signature/nightly.keystore
 signing.element.nightly.storePassword=Secret
 signing.element.nightly.keyId=Secret
 signing.element.nightly.keyPassword=Secret