From: Tobias Brunner <tobias@strongswan.org>
Date: Tue, 13 Jun 2017 13:15:53 +0000 (+0200)
Subject: android: Try to load existing user cert when importing VPN profile
X-Git-Tag: 5.6.0dr1~24^2~32
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bef8bc3aac62e0327c4e333c473aed0f99333a2f;p=thirdparty%2Fstrongswan.git

android: Try to load existing user cert when importing VPN profile
---

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 8ab1a178d1..679e419538 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
@@ -387,7 +387,15 @@ public class VpnProfileImportActivity extends AppCompatActivity
 		mRemoteCertificate.setVisibility(mProfile.Certificate != null ? View.VISIBLE : View.GONE);
 		mImportUserCert.setVisibility(mProfile.PKCS12 != null ? View.VISIBLE : View.GONE);
 
-		updateUserCertView();
+		if (mProfile.getVpnType().has(VpnTypeFeature.CERTIFICATE))
+		{	/* try to load an existing certificate with the default name */
+			if (mUserCertLoading == null)
+			{
+				mUserCertLoading = getString(R.string.profile_cert_alias, mProfile.getName());
+				getLoaderManager().initLoader(USER_CERT_LOADER, null, mUserCertificateLoaderCallbacks);
+			}
+			updateUserCertView();
+		}
 
 		if (mProfile.Certificate != null)
 		{