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

convert empty resources in messages to bare jid

This commit is contained in:
Daniel Gultsch 2018-04-28 21:30:30 +02:00
parent 04f34fb968
commit effeb7b585
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/eu/siacs/conversations/xml/Element.java
View File

@ -12,6 +12,7 @@ import java.util.Locale;
import eu.siacs.conversations.Config; import eu.siacs.conversations.Config;
import eu.siacs.conversations.utils.XmlHelper; import eu.siacs.conversations.utils.XmlHelper;
import eu.siacs.conversations.xmpp.InvalidJid; import eu.siacs.conversations.xmpp.InvalidJid;
import eu.siacs.conversations.xmpp.stanzas.MessagePacket;
import rocks.xmpp.addr.Jid; import rocks.xmpp.addr.Jid;
public class Element { public class Element {
@ -154,7 +155,7 @@ public class Element {
try { try {
return Jid.ofEscaped(jid); return Jid.ofEscaped(jid);
} catch (final IllegalArgumentException e) { } catch (final IllegalArgumentException e) {
return new InvalidJid(jid); return InvalidJid.of(jid, this instanceof MessagePacket);
} }
} }
return null; return null;

11
src/main/java/eu/siacs/conversations/xmpp/InvalidJid.java
View File

@ -37,9 +37,18 @@ public class InvalidJid implements Jid {
private final String value; private final String value;
public InvalidJid(String jid) { private InvalidJid(String jid) {
this.value = jid; this.value = jid;
} }
public static Jid of(String jid, boolean fallback) {
final int pos = jid.indexOf('/');
if (fallback && pos >= 0 && jid.length() >= pos + 1) {
if (jid.substring(pos+1).trim().isEmpty()) {
return Jid.ofEscaped(jid.substring(0,pos));
}
}
return new InvalidJid(jid);
}
@Override @Override
@NonNull @NonNull