Do not crash when XMPP URI contains invalid JID

Stephen Paul Weber created 3 years ago

Change summary

src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java | 14 
1 file changed, 8 insertions(+), 6 deletions(-)

Detailed changes

src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java

@@ -501,12 +501,14 @@ public class MessageAdapter extends ArrayAdapter<Message> {
             for (final URLSpan urlspan : body.getSpans(0, body.length() - 1, URLSpan.class)) {
                 Uri uri = Uri.parse(urlspan.getURL());
                 if ("xmpp".equals(uri.getScheme())) {
-                    Contact contact = roster.getContact(Jid.of(uri.getSchemeSpecificPart()));
-                    body.replace(
-                        body.getSpanStart(urlspan),
-                        body.getSpanEnd(urlspan),
-                        contact.getDisplayName()
-                    );
+                    try {
+                        Contact contact = roster.getContact(Jid.of(uri.getSchemeSpecificPart()));
+                        body.replace(
+                            body.getSpanStart(urlspan),
+                            body.getSpanEnd(urlspan),
+                            contact.getDisplayName()
+                        );
+                    } catch (final IllegalArgumentException e) { /* bad JID */ }
                 }
             }
             viewHolder.messageBody.setAutoLinkMask(0);