From 532c33a13baf0beeaf7f2ded6c4481b2b66d79db Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Sat, 28 Mar 2020 18:06:23 -0600 Subject: MonkeyedTextInputEditText: make more robust Signed-off-by: Jason A. Donenfeld --- .../java/com/wireguard/android/widget/MonkeyedTextInputEditText.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'ui') diff --git a/ui/src/main/java/com/wireguard/android/widget/MonkeyedTextInputEditText.kt b/ui/src/main/java/com/wireguard/android/widget/MonkeyedTextInputEditText.kt index 8316d65e..97746c09 100644 --- a/ui/src/main/java/com/wireguard/android/widget/MonkeyedTextInputEditText.kt +++ b/ui/src/main/java/com/wireguard/android/widget/MonkeyedTextInputEditText.kt @@ -19,12 +19,12 @@ class MonkeyedTextInputEditText @JvmOverloads constructor(context: Context, attr val text = super.getText() if (!text.isNullOrEmpty()) return text - /* We want this expression in TextInputLayout.java to be true: + /* We want this expression in TextInputLayout.java to be true if there's a hint set: * final boolean hasText = editText != null && !TextUtils.isEmpty(editText.getText()); * But for everyone else it should return the real value, so we check the caller. */ - if (Thread.currentThread().stackTrace[3].className == TextInputLayout::class.qualifiedName) - return SpannableStringBuilder(" ") + if (!hint.isNullOrEmpty() && Thread.currentThread().stackTrace[3].className == TextInputLayout::class.qualifiedName) + return SpannableStringBuilder(hint) return text } } -- cgit v1.2.3