From: Tobias Brunner <tobias@strongswan.org>
Date: Tue, 8 Oct 2019 13:51:18 +0000 (+0200)
Subject: android: Don't use specific key types to select user certificates
X-Git-Tag: 5.8.2dr1~7^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1227b43fe4335b185a2c870ddda9da5c3d7cbf76;p=thirdparty%2Fstrongswan.git

android: Don't use specific key types to select user certificates

Android 10 will honor the preselection and could, thus, hide some
installed certificates if we only pass "RSA".  The dialog will also only
be shown if there are actually certificates installed (i.e. users will
have to do that manually outside of the app or via profile import).

Fixes #3196.
---

diff --git a/src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnProfileDetailActivity.java b/src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnProfileDetailActivity.java
index eaed550111..fac9b34ea8 100644
--- a/src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnProfileDetailActivity.java
+++ b/src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnProfileDetailActivity.java
@@ -925,7 +925,7 @@ public class VpnProfileDetailActivity extends AppCompatActivity
 		public void onClick(View v)
 		{
 			String useralias = mUserCertEntry != null ? mUserCertEntry.getAlias() : null;
-			KeyChain.choosePrivateKeyAlias(VpnProfileDetailActivity.this, this, new String[] { "RSA" }, null, null, -1, useralias);
+			KeyChain.choosePrivateKeyAlias(VpnProfileDetailActivity.this, this, null, null, null, -1, useralias);
 		}
 
 		@Override
diff --git a/src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnProfileImportActivity.java b/src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnProfileImportActivity.java
index 14fa70014f..33b396629f 100644
--- a/src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnProfileImportActivity.java
+++ b/src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnProfileImportActivity.java
@@ -889,7 +889,7 @@ public class VpnProfileImportActivity extends AppCompatActivity
 			{
 				alias = getString(R.string.profile_cert_alias, mProfile.getName());
 			}
-			KeyChain.choosePrivateKeyAlias(VpnProfileImportActivity.this, this, new String[] { "RSA" }, null, null, -1, alias);
+			KeyChain.choosePrivateKeyAlias(VpnProfileImportActivity.this, this, null, null, null, -1, alias);
 		}
 
 		@Override