From: Tobias Brunner <tobias@strongswan.org>
Date: Fri, 26 Sep 2025 11:49:53 +0000 (+0200)
Subject: android: Don't print "null" if no user certificate is selected
X-Git-Tag: android-2.6.0^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1a16b2c0cb1ac2eab78cb6a94ce73c570c58a22d;p=thirdparty%2Fstrongswan.git

android: Don't print "null" if no user certificate is selected
---

diff --git a/src/frontends/android/app/src/main/java/org/strongswan/android/ui/adapter/VpnProfileAdapter.java b/src/frontends/android/app/src/main/java/org/strongswan/android/ui/adapter/VpnProfileAdapter.java
index c2942b8a18..097c422a1d 100644
--- a/src/frontends/android/app/src/main/java/org/strongswan/android/ui/adapter/VpnProfileAdapter.java
+++ b/src/frontends/android/app/src/main/java/org/strongswan/android/ui/adapter/VpnProfileAdapter.java
@@ -86,7 +86,8 @@ public class VpnProfileAdapter extends ArrayAdapter<VpnProfile>
 		tv = vpnProfileView.findViewById(R.id.profile_item_certificate);
 		if (profile.getVpnType().has(VpnTypeFeature.CERTIFICATE))
 		{
-			tv.setText(getContext().getString(R.string.profile_user_certificate_label) + ": " + profile.getUserCertificateAlias());
+			String alias = profile.getUserCertificateAlias();
+			tv.setText(getContext().getString(R.string.profile_user_certificate_label) + ": " + (alias != null ? alias : ""));
 			tv.setVisibility(View.VISIBLE);
 		}
 		else