From 105947f1bbff1ac759e986452977821248bc89da Mon Sep 17 00:00:00 2001
From: cketti <cketti@thunderbird.net>
Date: Thu, 16 Feb 2023 17:50:51 +0100
Subject: [PATCH] Prefix keystore properties with "k9mail."

---
 app/k9mail/build.gradle | 16 ++++++++--------
 docs/RELEASING.md       |  8 ++++----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/k9mail/build.gradle b/app/k9mail/build.gradle
index 0cad731bc..32051050d 100644
--- a/app/k9mail/build.gradle
+++ b/app/k9mail/build.gradle
@@ -119,15 +119,15 @@ android {
     }
 }
 
-if (project.hasProperty('keyAlias')) {
-    android.signingConfigs.release.keyAlias = keyAlias
+if (project.hasProperty('k9mail.keyAlias')) {
+    android.signingConfigs.release.keyAlias = project.property('k9mail.keyAlias')
 }
-if (project.hasProperty('keyPassword')) {
-    android.signingConfigs.release.keyPassword = keyPassword
+if (project.hasProperty('k9mail.keyPassword')) {
+    android.signingConfigs.release.keyPassword = project.property('k9mail.keyPassword')
 }
-if (project.hasProperty('storeFile')) {
-    android.signingConfigs.release.storeFile = file(storeFile)
+if (project.hasProperty('k9mail.storeFile')) {
+    android.signingConfigs.release.storeFile = file(project.property('k9mail.storeFile'))
 }
-if (project.hasProperty('storePassword')) {
-    android.signingConfigs.release.storePassword = storePassword
+if (project.hasProperty('k9mail.storePassword')) {
+    android.signingConfigs.release.storePassword = project.property('k9mail.storePassword')
 }
diff --git a/docs/RELEASING.md b/docs/RELEASING.md
index f29a15a24..52f1e7ad3 100644
--- a/docs/RELEASING.md
+++ b/docs/RELEASING.md
@@ -5,10 +5,10 @@
 1. Download `tb-android keystore` from 1Password and place it somewhere outside the root of the Git repository.
 2. Add the following to `~/.gradle/gradle.properties` (create the file if necessary)
    ```
-   storeFile=<path to keystore>
-   storePassword=<password 'tb-android keystore' in 1Password>
-   keyAlias=k9mail
-   keyPassword=<password 'k9mail@tb-android' in 1Password>
+   k9mail.storeFile=<path to keystore>
+   k9mail.storePassword=<password 'tb-android keystore' in 1Password>
+   k9mail.keyAlias=k9mail
+   k9mail.keyPassword=<password 'k9mail@tb-android' in 1Password>
    ```
 
 ## Release a beta version