From 2b0dcbbd1750c9d9409cd3eaec8670f0f6313c72 Mon Sep 17 00:00:00 2001 From: Eric House Date: Sat, 20 Jun 2020 14:43:21 -0700 Subject: [PATCH] work around NPE Not sure if the name being null is ok, but this is likely better code. --- .../main/java/org/eehouse/android/xw4/BTInviteDelegate.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTInviteDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTInviteDelegate.java index 868486775..da106a17f 100644 --- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTInviteDelegate.java +++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTInviteDelegate.java @@ -27,6 +27,7 @@ import android.content.Context; import android.content.Intent; import android.os.Bundle; import android.os.Handler; +import android.text.TextUtils; import android.text.format.DateUtils; import android.view.View; import android.widget.Button; @@ -74,7 +75,7 @@ public class BTInviteDelegate extends InviteDelegate { pairs = new ArrayList<>(); } else { for ( TwoStringPair pair : pairs ) { - alreadyHave = pair.str2.equals(devName); + alreadyHave = TextUtils.equals(pair.str2, devName); if ( alreadyHave ) { break; }