From 7e633d31a0e5f763c0b77ce9ae34a923bad0cce3 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kspearrin@users.noreply.github.com>
Date: Tue, 2 Jun 2020 10:36:16 -0400
Subject: [PATCH] sign fdroid builds with a different keystore (#949)

---
 src/Android/Android.csproj          |   1 +
 src/Android/ci-build-apks.ps1       |   9 ++++++---
 src/Android/fdroid-keystore.jks.enc | Bin 0 -> 2144 bytes
 3 files changed, 7 insertions(+), 3 deletions(-)
 create mode 100644 src/Android/fdroid-keystore.jks.enc

diff --git a/src/Android/Android.csproj b/src/Android/Android.csproj
index a711fbb8d..fbaab9427 100644
--- a/src/Android/Android.csproj
+++ b/src/Android/Android.csproj
@@ -150,6 +150,7 @@
     <None Include="ci-build-apks.ps1" />
     <GoogleServicesJson Include="google-services.json" />
     <GoogleServicesJson Include="google-services.json.enc" />
+    <None Include="fdroid-keystore.jks.enc" />
     <None Include="Properties\AndroidManifest.xml" />
     <None Include="upload-keystore.jks.enc" />
   </ItemGroup>
diff --git a/src/Android/ci-build-apks.ps1 b/src/Android/ci-build-apks.ps1
index 4e23c212f..5edc863b4 100644
--- a/src/Android/ci-build-apks.ps1
+++ b/src/Android/ci-build-apks.ps1
@@ -22,10 +22,12 @@ echo "##### Decrypt Keystore"
 echo "########################################"
 
 $encKeystorePath = $($rootPath + "\src\Android\8bit.keystore.enc");
+$encFdroidKeystorePath = $($rootPath + "\src\Android\fdroid-keystore.jks.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 $($encFdroidKeystorePath) -secret $($env:fdroid_apk_keystore_dec_secret)"
 Invoke-Expression "& `"$secureFilePath`" -decrypt $($encUploadKeystorePath) -secret $($env:upload_keystore_dec_secret)"
 
 echo "########################################"
@@ -146,9 +148,10 @@ echo "########################################"
 msbuild "$($androidPath)" "/logger:C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" `
     "/p:Configuration=FDroid"
 msbuild "$($androidPath)" "/t:SignAndroidPackage" "/p:Configuration=FDroid" "/p:AndroidKeyStore=true" `
-    "/p:AndroidSigningKeyAlias=bitwarden" "/p:AndroidSigningKeyPass=$($env:keystore_password)" `
-    "/p:AndroidSigningKeyStore=8bit.keystore" "/p:AndroidSigningStorePass=$($env:keystore_password)" "/v:quiet"
-	
+    "/p:AndroidSigningKeyAlias=bitwarden" "/p:AndroidSigningKeyPass=$($env:fdroid_apk_keystore_password)" `
+    "/p:AndroidSigningKeyStore=fdroid-keystore.jks" "/p:AndroidSigningStorePass=$($env:fdroid_apk_keystore_password)" `
+    "/v:quiet"
+
 echo "########################################"
 echo "##### Copy FDroid apk to project root"
 echo "########################################"
diff --git a/src/Android/fdroid-keystore.jks.enc b/src/Android/fdroid-keystore.jks.enc
new file mode 100644
index 0000000000000000000000000000000000000000..038c5a19146a9da577ea9cb249427e27a1d39adf
GIT binary patch
literal 2144
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
WB&!Cj2K)u=MV`oI94c6c4m$OKl_DVk

literal 0
HcmV?d00001