Swiftdiff options
| author | Tarun Gupta <tarun1995gupta@gmail.com> | 2015-07-26 07:47:40 (GMT) |
|---|---|---|
| committer | Tarun Gupta <tarun1995gupta@gmail.com> | 2015-08-17 13:21:01 (GMT) |
| commit | f56f245c1f7e768caf356a0e7b57f428cf8cc6da (patch) | |
| tree | f0935ab00c73e86163abe72fc9c20098121fff4f /src/com/isode/stroke/client/NickResolver.java | |
| parent | 2533374644704040ca67aba4e1240a9d6ea450c8 (diff) | |
| download | stroke-f56f245c1f7e768caf356a0e7b57f428cf8cc6da.zip stroke-f56f245c1f7e768caf356a0e7b57f428cf8cc6da.tar.bz2 | |
Update Client.
Updates all bits of Client to be in parity with Swiften.
Some part of code which depends on Network is commented.
License:
This patch is BSD-licensed, see Documentation/Licenses/BSD-simplified.txt for details.
Test-Information:
Tests added for: ClientBlockListManager, ClientSession and NickResolver.
All tests pass.
Change-Id: I5b9b0e5ae5b2df58202e2349ba24e4544d9a4614
Diffstat (limited to 'src/com/isode/stroke/client/NickResolver.java')
| -rw-r--r-- | src/com/isode/stroke/client/NickResolver.java | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/com/isode/stroke/client/NickResolver.java b/src/com/isode/stroke/client/NickResolver.java index fe2b129..470e4b9 100644 --- a/src/com/isode/stroke/client/NickResolver.java +++ b/src/com/isode/stroke/client/NickResolver.java @@ -16,14 +16,19 @@ import com.isode.stroke.signals.Slot2; import com.isode.stroke.signals.Slot3; import com.isode.stroke.vcards.VCardManager; +// FIXME: The NickResolver currently relies on the vcard being requested by the client on login. +// The VCardManager should get an onConnected() signal (which is signalled when the stanzachannel is available(, and each time this is emitted, +// the nickresolver should request the vcard. +// FIXME: The ownJID functionality should probably be removed, and NickManager should be used directly. + public class NickResolver { - private JID ownJID_; - private String ownNick_; + private JID ownJID_ = new JID(); + private String ownNick_ = ""; private XMPPRoster xmppRoster_; private MUCRegistry mucRegistry_; private VCardManager vcardManager_; - public final Signal2<JID, String> onNickChanged = new Signal2<JID, String>(); + public final Signal2<JID, String /*previousNick*/ > onNickChanged = new Signal2<JID, String>(); public NickResolver(final JID ownJID, XMPPRoster xmppRoster, VCardManager vcardManager, MUCRegistry mucRegistry) { ownJID_ = ownJID; @@ -57,7 +62,7 @@ public class NickResolver { } void handleJIDAdded(final JID jid) { - String oldNick= jidToNick(jid); + String oldNick = jidToNick(jid); onNickChanged.emit(jid, oldNick); } @@ -67,7 +72,7 @@ public class NickResolver { return ownNick_; } } - + String nick = ""; if (mucRegistry_ != null && mucRegistry_.isMUC(jid.toBare()) ) { return jid.getResource().isEmpty() ? jid.toBare().toString() : jid.getResource(); } @@ -83,6 +88,7 @@ public class NickResolver { if (jid.compare(ownJID_, JID.CompareType.WithoutResource) != 0) { return; } + String initialNick = ownNick_; ownNick_ = ownJID_.toString(); if (ownVCard != null) { if (!ownVCard.getNickname().isEmpty()) { |