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 8ab1a178d..679e41953 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) {