diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-10-28 17:15:35 +0100 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-10-28 17:15:35 +0100 |
| commit | f256a466d812744937f50e4270bd915d34be536d (patch) | |
| tree | 1e3e10ff6d7e61d8877de5fa04bab58755977bf6 /src/eu/siacs/conversations | |
| parent | 161623eca28a6e80849aeabbd719d349a4696697 (diff) | |
improvements on findConversation
Diffstat (limited to 'src/eu/siacs/conversations')
| -rw-r--r-- | src/eu/siacs/conversations/services/XmppConnectionService.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/eu/siacs/conversations/services/XmppConnectionService.java b/src/eu/siacs/conversations/services/XmppConnectionService.java index 6d6c672e..25ca48f2 100644 --- a/src/eu/siacs/conversations/services/XmppConnectionService.java +++ b/src/eu/siacs/conversations/services/XmppConnectionService.java @@ -922,9 +922,9 @@ public class XmppConnectionService extends Service { public Conversation find(List<Conversation> haystack, Account account, String jid) { for (Conversation conversation : haystack) { - if ((account == null || conversation.getAccount().equals(account)) + if ((account == null || conversation.getAccount() == account) && (conversation.getContactJid().split("/", 2)[0] - .equals(jid))) { + .equalsIgnoreCase(jid))) { return conversation; } } |