From b772aebf4908fa62e75c5a8ee461f15e62ce0d5f Mon Sep 17 00:00:00 2001
From: bxdxnn <267911624+bxdxnn@users.noreply.github.com>
Date: Tue, 15 Sep 2026 14:45:26 +0000
Subject: [PATCH] Address review

---
 app/build.gradle.kts                          | 27 +++++--------------
 .../main/kotlin/extension/CommonExtension.kt  |  9 +++++++
 2 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 84eb43fc5f..64bc93cb6f 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -21,6 +21,7 @@ import extension.allFeaturesImpl
 import extension.allLibrariesImpl
 import extension.allServicesImpl
 import extension.buildConfigFieldStr
+import extension.environmentOrGradleValue
 import extension.locales
 import extension.setupDependencyInjection
 import extension.testCommonDependencies
@@ -38,12 +39,6 @@ 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"
 
@@ -94,22 +89,14 @@ android {
             storePassword = "android"
         }
         register("nightly") {
-            keyAlias = signingValue("ELEMENT_ANDROID_NIGHTLY_KEYID", "signing.element.nightly.keyId")
-            keyPassword = signingValue("ELEMENT_ANDROID_NIGHTLY_KEYPASSWORD", "signing.element.nightly.keyPassword")
+            keyAlias = environmentOrGradleValue("ELEMENT_ANDROID_NIGHTLY_KEYID", "signing.element.nightly.keyId")
+            keyPassword = environmentOrGradleValue("ELEMENT_ANDROID_NIGHTLY_KEYPASSWORD", "signing.element.nightly.keyPassword")
             storeFile = file(
-                signingValue("ELEMENT_ANDROID_NIGHTLY_STOREFILE", "signing.element.nightly.storeFile")
+                environmentOrGradleValue("ELEMENT_ANDROID_NIGHTLY_STOREFILE", "signing.element.nightly.storeFile")
+                    ?.ifBlank { null }
                     ?: "./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")
-            }
+            storePassword = environmentOrGradleValue("ELEMENT_ANDROID_NIGHTLY_STOREPASSWORD", "signing.element.nightly.storePassword")
         }
     }
 
@@ -137,7 +124,7 @@ android {
                 "login_redirect_scheme",
                 oAuthRedirectSchemeBase,
             )
-            signingConfig = signingConfigs.findByName("release") ?: signingConfigs.getByName("debug")
+            signingConfig = signingConfigs.getByName("debug")
 
             optimization {
                 enable = true
diff --git a/plugins/src/main/kotlin/extension/CommonExtension.kt b/plugins/src/main/kotlin/extension/CommonExtension.kt
index 1f24473f8e..ad6badb613 100644
--- a/plugins/src/main/kotlin/extension/CommonExtension.kt
+++ b/plugins/src/main/kotlin/extension/CommonExtension.kt
@@ -117,3 +117,12 @@ fun Project.defaultLintOptions(lint: Lint) = lint.apply {
     ignoreTestFixturesSources = true
     checkGeneratedSources = false
 }
+
+fun Project.environmentOrGradleValue(
+    environmentVariableName: String,
+    gradlePropertyName: String,
+    defaultValue: String? = null,
+): String? = providers.environmentVariable(environmentVariableName)
+    .orElse(providers.gradleProperty(gradlePropertyName))
+    .orNull
+    ?: defaultValue