From dc78ba3c04ef0fa79c0e81a733c344b08fb3a776 Mon Sep 17 00:00:00 2001
From: ThomasV <thomasv@electrum.org>
Date: Tue, 27 Sep 2022 20:12:02 +0200
Subject: [PATCH] android: pass keystore password as argument to make_apk.
 export does not work because it runs in a container.

also, check password using keytool
---
 contrib/android/make_apk.sh | 2 ++
 contrib/release.sh          | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/contrib/android/make_apk.sh b/contrib/android/make_apk.sh
index d20289568..e66d57666 100755
--- a/contrib/android/make_apk.sh
+++ b/contrib/android/make_apk.sh
@@ -53,6 +53,8 @@ fi
 if [[ "$3" == "release" ]] ; then
     # do release build, and sign the APKs.
     TARGET="release"
+    export P4A_RELEASE_KEYSTORE_PASSWD="$4"
+    export P4A_RELEASE_KEYALIAS_PASSWD="$4"
     export P4A_RELEASE_KEYSTORE=~/.keystore
     export P4A_RELEASE_KEYALIAS=electrum
     if [ -z "$P4A_RELEASE_KEYSTORE_PASSWD" ] || [ -z "$P4A_RELEASE_KEYALIAS_PASSWD" ]; then
diff --git a/contrib/release.sh b/contrib/release.sh
index 9fec67cd4..d749312d7 100755
--- a/contrib/release.sh
+++ b/contrib/release.sh
@@ -66,10 +66,10 @@ fi
 if [ ! -z "$RELEASEMANAGER" ] ; then
     echo -n "Code signing passphrase:"
     read -s password
+    # tests password against keystore
+    keytool -list -storepass $password
+    # the same password is used for windows signing
     export WIN_SIGNING_PASSWORD=$password
-    export P4A_RELEASE_KEYSTORE_PASSWD=$password
-    export P4A_RELEASE_KEYALIAS_PASSWD=$password
-    # TODO add tests here to see if pw is correct
 fi
 
 
@@ -147,7 +147,7 @@ if test -f "dist/$apk1"; then
     info "file exists: $apk1"
 else
     if [ ! -z "$RELEASEMANAGER" ] ; then
-        ./contrib/android/build.sh kivy all release
+        ./contrib/android/build.sh kivy all release $password
     else
         ./contrib/android/build.sh kivy all release-unsigned
         mv "dist/$apk1_unsigned" "dist/$apk1"