From 8af50736e12431da4bf7254c4f70ad5823b65364 Mon Sep 17 00:00:00 2001
From: Tobias Brunner <tobias@strongswan.org>
Date: Tue, 13 Aug 2019 15:26:22 +0200
Subject: [PATCH] android: Fix null pointer dereference in
 TextInputLayoutHelper

The AndroidX/Material version of TextInputLayout actually supports a
helper text, but it is always shown, so we continue to use our version.
---
 .../strongswan/android/ui/widget/TextInputLayoutHelper.java  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/frontends/android/app/src/main/java/org/strongswan/android/ui/widget/TextInputLayoutHelper.java b/src/frontends/android/app/src/main/java/org/strongswan/android/ui/widget/TextInputLayoutHelper.java
index 4897933d9..f5390620f 100644
--- a/src/frontends/android/app/src/main/java/org/strongswan/android/ui/widget/TextInputLayoutHelper.java
+++ b/src/frontends/android/app/src/main/java/org/strongswan/android/ui/widget/TextInputLayoutHelper.java
@@ -143,7 +143,10 @@ public class TextInputLayoutHelper extends TextInputLayout
 	 */
 	public void setHelperText(CharSequence text)
 	{
-		mHelperText.setText(text);
+		if (mHelperText != null)
+		{
+			mHelperText.setText(text);
+		}
 	}
 
 	private void showHelper(boolean show)