diff options
| author | Christian Schneppe <christian@pix-art.de> | 2016-05-31 21:38:06 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2016-05-31 21:38:06 +0200 |
| commit | c23642b8cd2c06c5f3e9cf7f88d31ed5c6f78614 (patch) | |
| tree | a7c53e5dd6dd6e85213cff834d35316a29617753 /src/main/java/eu/siacs/conversations/utils/XmppUri.java | |
| parent | 2cdc31a6887f242dfe4faca91af63ffd4e74ef67 (diff) | |
| parent | ea6a008b39b0f669f66f3c8aec08b4deb3ece154 (diff) | |
Merge remote-tracking branch 'refs/remotes/siacs/master'
Diffstat (limited to 'src/main/java/eu/siacs/conversations/utils/XmppUri.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/utils/XmppUri.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/main/java/eu/siacs/conversations/utils/XmppUri.java b/src/main/java/eu/siacs/conversations/utils/XmppUri.java index 9d42a639b..4039f8b0a 100644 --- a/src/main/java/eu/siacs/conversations/utils/XmppUri.java +++ b/src/main/java/eu/siacs/conversations/utils/XmppUri.java @@ -47,6 +47,7 @@ public class XmppUri { // sample : https://conversations.im/i/foo/bar.com jid = segments.get(1) + "@" + segments.get(2); } + muc = segments.size() > 1 && "j".equalsIgnoreCase(segments.get(0)); } else if ("xmpp".equalsIgnoreCase(scheme)) { // sample: xmpp:foo@bar.com muc = "join".equalsIgnoreCase(uri.getQuery()); |