diff options
Diffstat (limited to '')
| -rw-r--r-- | src/main/java/de/pixart/messenger/xmpp/stanzas/AbstractStanza.java | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/src/main/java/de/pixart/messenger/xmpp/stanzas/AbstractStanza.java b/src/main/java/de/pixart/messenger/xmpp/stanzas/AbstractStanza.java index 58d2a8b68..ee0884aa6 100644 --- a/src/main/java/de/pixart/messenger/xmpp/stanzas/AbstractStanza.java +++ b/src/main/java/de/pixart/messenger/xmpp/stanzas/AbstractStanza.java @@ -31,20 +31,23 @@ public class AbstractStanza extends Element { } public boolean fromServer(final Account account) { - return getFrom() == null - || getFrom().equals(Jid.of(account.getServer())) - || getFrom().equals(account.getJid().asBareJid()) - || getFrom().equals(account.getJid()); + final Jid from = getFrom(); + return from == null + || from.equals(Jid.of(account.getServer())) + || from.equals(account.getJid().asBareJid()) + || from.equals(account.getJid()); } public boolean toServer(final Account account) { - return getTo() == null - || getTo().equals(Jid.of(account.getServer())) - || getTo().equals(account.getJid().asBareJid()) - || getTo().equals(account.getJid()); + final Jid to = getTo(); + return to == null + || to.equals(Jid.of(account.getServer())) + || to.equals(account.getJid().asBareJid()) + || to.equals(account.getJid()); } public boolean fromAccount(final Account account) { - return getFrom() != null && getFrom().asBareJid().equals(account.getJid().asBareJid()); + final Jid from = getFrom(); + return from != null && from.asBareJid().equals(account.getJid().asBareJid()); } } |