sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

do not use empty display name for /me command

This commit is contained in:
Daniel Gultsch 2021-01-22 12:51:01 +01:00
parent 3b43cb0bda
commit 582aee4718
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/eu/siacs/conversations/utils/UIHelper.java
View File

@ -7,6 +7,8 @@ import android.text.format.DateFormat;
import android.text.format.DateUtils; import android.text.format.DateUtils;
import android.util.Pair; import android.util.Pair;
import com.google.common.base.Strings;
import java.math.BigInteger; import java.math.BigInteger;
import java.security.MessageDigest; import java.security.MessageDigest;
import java.util.Arrays; import java.util.Arrays;
@ -33,7 +35,7 @@ import eu.siacs.conversations.xmpp.Jid;
public class UIHelper { public class UIHelper {
private static int[] UNSAFE_COLORS = { private static final int[] UNSAFE_COLORS = {
0xFFF44336, //red 500 0xFFF44336, //red 500
0xFFE53935, //red 600 0xFFE53935, //red 600
0xFFD32F2F, //red 700 0xFFD32F2F, //red 700
@ -46,7 +48,7 @@ public class UIHelper {
0xFFD84315, //deep orange 800, 0xFFD84315, //deep orange 800,
}; };
private static int[] SAFE_COLORS = { private static final int[] SAFE_COLORS = {
0xFFE91E63, //pink 500 0xFFE91E63, //pink 500
0xFFD81B60, //pink 600 0xFFD81B60, //pink 600
0xFFC2185B, //pink 700 0xFFC2185B, //pink 700
@ -524,10 +526,13 @@ public class UIHelper {
} else { } else {
final Account account = conversation.getAccount(); final Account account = conversation.getAccount();
final Jid jid = account.getJid(); final Jid jid = account.getJid();
if (account.getDisplayName() != null) { final String displayName = account.getDisplayName();
return account.getDisplayName(); if (Strings.isNullOrEmpty(displayName)) {
}
return jid.getLocal() != null ? jid.getLocal() : jid.getDomain().toString(); return jid.getLocal() != null ? jid.getLocal() : jid.getDomain().toString();
} else {
return displayName;
}
} }
} }
} }
@ -564,14 +569,16 @@ public class UIHelper {
} }
} }
public static boolean receivedLocationQuestion(Message message) { public static boolean receivedLocationQuestion(final Message message) {
if (message == null if (message == null
|| message.getStatus() != Message.STATUS_RECEIVED || message.getStatus() != Message.STATUS_RECEIVED
|| message.getType() != Message.TYPE_TEXT) { || message.getType() != Message.TYPE_TEXT) {
return false; return false;
} }
String body = message.getBody() == null ? null : message.getBody().trim().toLowerCase(Locale.getDefault()); final String body = Strings.nullToEmpty(message.getBody())
body = body.replace("?", "").replace("¿", ""); .trim()
.toLowerCase(Locale.getDefault())
.replace("?", "").replace("¿", "");
return LOCATION_QUESTIONS.contains(body); return LOCATION_QUESTIONS.contains(body);
} }