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

catch conversations.im invite urls directly in fragment

This commit is contained in:
Daniel Gultsch 2018-09-18 17:15:52 +02:00
parent 53cd58c955
commit 5be64de7be
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
View File

@ -3441,7 +3441,7 @@ public class XmppConnectionService extends Service {
public Conversation findUniqueConversationByJid(XmppUri xmppUri) { public Conversation findUniqueConversationByJid(XmppUri xmppUri) {
List<Conversation> findings = new ArrayList<>(); List<Conversation> findings = new ArrayList<>();
for (Conversation c : getConversations()) { for (Conversation c : getConversations()) {
if (c.getJid().asBareJid().equals(xmppUri.getJid()) && ((c.getMode() == Conversational.MODE_MULTI) == xmppUri.isAction(XmppUri.ACTION_JOIN))) { if (c.getAccount().isEnabled() && c.getJid().asBareJid().equals(xmppUri.getJid()) && ((c.getMode() == Conversational.MODE_MULTI) == xmppUri.isAction(XmppUri.ACTION_JOIN))) {
findings.add(c); findings.add(c);
} }
} }

2
src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
View File

@ -167,7 +167,7 @@ public class ContactDetailsActivity extends OmemoActivity implements OnAccountUp
@Override @Override
protected String getShareableUri(boolean http) { protected String getShareableUri(boolean http) {
if (http) { if (http) {
return "https://conversations.im/j/" + XmppUri.lameUrlEncode(contact.getJid().asBareJid().toEscapedString()); return "https://conversations.im/i/" + XmppUri.lameUrlEncode(contact.getJid().asBareJid().toEscapedString());
} else { } else {
return "xmpp:" + contact.getJid().asBareJid().toEscapedString(); return "xmpp:" + contact.getJid().asBareJid().toEscapedString();
} }

5
src/main/java/eu/siacs/conversations/ui/text/FixedURLSpan.java
View File

@ -42,6 +42,8 @@ import android.util.Log;
import android.view.View; import android.view.View;
import android.widget.Toast; import android.widget.Toast;
import java.util.Arrays;
import eu.siacs.conversations.Config; import eu.siacs.conversations.Config;
import eu.siacs.conversations.R; import eu.siacs.conversations.R;
import eu.siacs.conversations.ui.ConversationsActivity; import eu.siacs.conversations.ui.ConversationsActivity;
@ -68,7 +70,8 @@ public class FixedURLSpan extends URLSpan {
public void onClick(View widget) { public void onClick(View widget) {
final Uri uri = Uri.parse(getURL()); final Uri uri = Uri.parse(getURL());
final Context context = widget.getContext(); final Context context = widget.getContext();
if (uri.getScheme().equals("xmpp") && context instanceof ConversationsActivity) { final boolean candidateToProcessDirecty = "xmpp".equals(uri.getScheme()) || ("https".equals(uri.getScheme()) && "conversations.im".equals(uri.getHost()) && uri.getPathSegments().size() > 1 && Arrays.asList("j","i").contains(uri.getPathSegments().get(0)));
if (candidateToProcessDirecty && context instanceof ConversationsActivity) {
if (((ConversationsActivity) context).onXmppUriClicked(uri)) { if (((ConversationsActivity) context).onXmppUriClicked(uri)) {
widget.playSoundEffect(0); widget.playSoundEffect(0);
return; return;