From 6883864e2d1b5d1ec581862dc334ca8b437853af Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Thu, 16 Apr 2020 16:31:52 -0400
Subject: [PATCH] sign with upload keystore

---
 appveyor.yml                        |   2 +-
 src/Android/Android.csproj          |   1 +
 src/Android/ci-build-apks.ps1       |   9 ++++++---
 src/Android/upload-keystore.jks.enc | Bin 0 -> 2288 bytes
 4 files changed, 8 insertions(+), 4 deletions(-)
 create mode 100644 src/Android/upload-keystore.jks.enc

diff --git a/appveyor.yml b/appveyor.yml
index 49da3834c..ee0bd1c37 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -55,7 +55,7 @@ before_build:
 - ps: |
     if($isWindows) {
       nuget restore
-      if($env:KEYSTORE_DEC_SECRET -or $env:GOOGLE_SERVICES_DEC_SECRET -or $env:PLAY_DEC_SECRET) {
+      if($env:UPLOAD_KEYSTORE_DEC_SECRET -or$env:KEYSTORE_DEC_SECRET -or $env:GOOGLE_SERVICES_DEC_SECRET -or $env:PLAY_DEC_SECRET) {
         nuget install secure-file -ExcludeVersion
       }
       if($env:GOOGLE_SERVICES_DEC_SECRET) {
diff --git a/src/Android/Android.csproj b/src/Android/Android.csproj
index 89ef19db1..afe27f7a3 100644
--- a/src/Android/Android.csproj
+++ b/src/Android/Android.csproj
@@ -152,6 +152,7 @@
     <GoogleServicesJson Include="google-services.json" />
     <GoogleServicesJson Include="google-services.json.enc" />
     <None Include="Properties\AndroidManifest.xml" />
+    <None Include="upload-keystore.jks.enc" />
   </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\layout\Tabbar.axml" />
diff --git a/src/Android/ci-build-apks.ps1 b/src/Android/ci-build-apks.ps1
index dbf191f0a..240330c07 100644
--- a/src/Android/ci-build-apks.ps1
+++ b/src/Android/ci-build-apks.ps1
@@ -22,18 +22,21 @@ echo "##### Decrypt Keystore"
 echo "########################################"
 
 $encKeystorePath = $($rootPath + "\src\Android\8bit.keystore.enc");
+$encUploadKeystorePath = $($rootPath + "\src\Android\upload-keystore.jks.enc");
 $secureFilePath = $($rootPath + "\secure-file\tools\secure-file.exe");
 
 Invoke-Expression "& `"$secureFilePath`" -decrypt $($encKeystorePath) -secret $($env:keystore_dec_secret)"
+Invoke-Expression "& `"$secureFilePath`" -decrypt $($encUploadKeystorePath) -secret $($env:upload_keystore_dec_secret)"
 
 echo "########################################"
 echo "##### Sign Release Configuration"
 echo "########################################"
 
 msbuild "$($androidPath)" "/t:SignAndroidPackage" "/p:Configuration=Release" "/p:AndroidKeyStore=true" `
-    "/p:AndroidSigningKeyAlias=bitwarden" "/p:AndroidSigningKeyPass=$($env:keystore_password)" `
-    "/p:AndroidSigningKeyStore=8bit.keystore" "/p:AndroidSigningStorePass=$($env:keystore_password)" "/v:quiet"
-	
+    "/p:AndroidSigningKeyAlias=upload" "/p:AndroidSigningKeyPass=$($env:upload_keystore_password)" `
+    "/p:AndroidSigningKeyStore=upload-keystore.jks.enc" "/p:AndroidSigningStorePass=$($env:upload_keystore_password)" `
+    "/v:quiet"
+
 echo "########################################"
 echo "##### Copy Release apk to project root"
 echo "########################################"
diff --git a/src/Android/upload-keystore.jks.enc b/src/Android/upload-keystore.jks.enc
new file mode 100644
index 0000000000000000000000000000000000000000..bf413f8eab48c98233b80cfc0f132f8e0a4bdfbe
GIT binary patch
literal 2288
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
KW(?KCKN0@pYj^|z

literal 0
HcmV?d00001