Skip to content

Show XMPP URI links with contact name if there is a contact #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
singpolyma wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Show XMPP URI links with contact name if there is a contact #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ffb57b6
Show XMPP URI links with contact name if there is a contact
singpolyma Sep 26, 2022
7e5d47c
Get XMPP URI names from bookmarks as well
singpolyma Aug 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,7 @@ private void displayTextMessage(final ViewHolder viewHolder, final Message messa
if (highlightedTerm != null) {
StylingHelper.highlight(activity, body, highlightedTerm, StylingHelper.isDarkText(viewHolder.messageBody));
}
MyLinkify.addLinks(body, true);
MyLinkify.addLinks(body, message.getConversation().getAccount());
viewHolder.messageBody.setAutoLinkMask(0);
viewHolder.messageBody.setText(EmojiWrapper.transform(body));
viewHolder.messageBody.setMovementMethod(ClickableMovementMethod.getInstance());
Expand Down
26 changes: 26 additions & 0 deletions src/main/java/eu/siacs/conversations/ui/util/MyLinkify.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,22 @@

package eu.siacs.conversations.ui.util;

import android.net.Uri;
import android.os.Build;
import android.text.Editable;
import android.text.style.URLSpan;
import android.text.util.Linkify;

import java.util.Locale;

import eu.siacs.conversations.entities.Account;
import eu.siacs.conversations.entities.ListItem;
import eu.siacs.conversations.entities.Roster;
import eu.siacs.conversations.ui.text.FixedURLSpan;
import eu.siacs.conversations.utils.GeoHelper;
import eu.siacs.conversations.utils.Patterns;
import eu.siacs.conversations.utils.XmppUri;
import eu.siacs.conversations.xmpp.Jid;

public class MyLinkify {

Expand Down Expand Up @@ -118,4 +124,24 @@ public static void addLinks(Editable body, boolean includeGeo) {
}
FixedURLSpan.fix(body);
}

public static void addLinks(Editable body, Account account) {
addLinks(body, true);
Roster roster = account.getRoster();
for (final URLSpan urlspan : body.getSpans(0, body.length() - 1, URLSpan.class)) {
Uri uri = Uri.parse(urlspan.getURL());
if ("xmpp".equals(uri.getScheme())) {
try {
Jid jid = new XmppUri(uri).getJid();
ListItem item = account.getBookmark(jid);
if (item == null) item = roster.getContact(jid);
body.replace(
body.getSpanStart(urlspan),
body.getSpanEnd(urlspan),
item.getDisplayName()
);
} catch (final IllegalArgumentException e) { /* bad JID */ }
}
}
}
}
2 changes: 2 additions & 0 deletions src/main/java/eu/siacs/conversations/utils/UIHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import eu.siacs.conversations.entities.RtpSessionStatus;
import eu.siacs.conversations.entities.Transferable;
import eu.siacs.conversations.services.ExportBackupService;
import eu.siacs.conversations.ui.util.MyLinkify;
import eu.siacs.conversations.ui.util.QuoteHelper;
import eu.siacs.conversations.xmpp.Jid;

Expand Down Expand Up @@ -322,6 +323,7 @@ public static Pair<CharSequence, Boolean> getMessagePreview(final Context contex
if (textColor != 0) {
StylingHelper.format(styledBody, 0, styledBody.length() - 1, textColor);
}
MyLinkify.addLinks(styledBody, message.getConversation().getAccount());
SpannableStringBuilder builder = new SpannableStringBuilder();
for (CharSequence l : CharSequenceUtils.split(styledBody, '\n')) {
if (l.length() > 0) {
Expand Down