Swiftdiff options
| author | Tarun Gupta <tarun1995gupta@gmail.com> | 2015-06-28 14:32:23 (GMT) |
|---|---|---|
| committer | Kevin Smith <kevin.smith@isode.com> | 2015-07-06 11:38:12 (GMT) |
| commit | 665fc753249c848637adb7f5d44a68b77d4c642e (patch) | |
| tree | 6ec90a1a2ab534060b1e49b3d791d748f3bf140a /src/com/isode | |
| parent | 2b140e4789a654c68d1b534458be74c554e132d9 (diff) | |
| download | stroke-665fc753249c848637adb7f5d44a68b77d4c642e.zip stroke-665fc753249c848637adb7f5d44a68b77d4c642e.tar.bz2 | |
Add ChatStateNotifier.
Adds ChatStateNotifier, DummyEntityCapsProvider.
License:
This patch is BSD-licensed, see Documentation/Licenses/BSD-simplified.txt for details.
Test-Information:
Test added for Chate State Notifier, which passes.
Change-Id: Ie596d9c226526ab5ace334b7926389b61ca5540a
Diffstat (limited to 'src/com/isode')
| -rw-r--r-- | src/com/isode/stroke/chat/ChatStateNotifier.java | 110 | ||||
| -rw-r--r-- | src/com/isode/stroke/disco/DummyEntityCapsProvider.java | 34 |
2 files changed, 144 insertions, 0 deletions
diff --git a/src/com/isode/stroke/chat/ChatStateNotifier.java b/src/com/isode/stroke/chat/ChatStateNotifier.java new file mode 100644 index 0000000..dc96565 --- /dev/null +++ b/src/com/isode/stroke/chat/ChatStateNotifier.java @@ -0,0 +1,110 @@ +/* + * Copyright (c) 2010 Isode Limited. + * All rights reserved. + * See the COPYING file for more information. + */ +/* + * Copyright (c) 2015 Tarun Gupta. + * Licensed under the simplified BSD license. + * See Documentation/Licenses/BSD-simplified.txt for more information. + */ + +package com.isode.stroke.chat; + +import com.isode.stroke.elements.Message; +import com.isode.stroke.elements.ChatState; +import com.isode.stroke.elements.DiscoInfo; +import com.isode.stroke.disco.EntityCapsProvider; +import com.isode.stroke.client.StanzaChannel; +import com.isode.stroke.signals.SignalConnection; +import com.isode.stroke.signals.Slot1; +import com.isode.stroke.jid.JID; + +public class ChatStateNotifier { + + private StanzaChannel stanzaChannel_; + private EntityCapsProvider entityCapsManager_; + private JID contact_ = new JID(); + private boolean contactHas85Caps_; + private boolean contactHasSentActive_; + private boolean userIsTyping_; + private boolean contactIsOnline_; + private SignalConnection onCapsChangedConnection; + + public ChatStateNotifier(StanzaChannel stanzaChannel, JID contact, EntityCapsProvider entityCapsManager) { + this.stanzaChannel_ = stanzaChannel; + this.contact_ = contact; + this.entityCapsManager_ = entityCapsManager; + setContact(contact); + onCapsChangedConnection = entityCapsManager_.onCapsChanged.connect(new Slot1<JID>() { + + public void call(JID j1) { + handleCapsChanged(j1); + } + }); + } + + private boolean contactShouldReceiveStates() { + /* So, yes, the XEP says to look at caps, but it also says that once you've + heard from the contact, the active state overrides this. + *HOWEVER* it says that the MUST NOT send csn if you haven't received + active is OPTIONAL behaviour for if you haven't got caps.*/ + return contactIsOnline_ && (contactHasSentActive_ || contactHas85Caps_); + } + + private void changeState(ChatState.ChatStateType state) { + Message message = new Message(); + message.setTo(contact_); + message.addPayload(new ChatState(state)); + stanzaChannel_.sendMessage(message); + } + + private void handleCapsChanged(JID jid) { + if (jid.equals(contact_)) { + DiscoInfo caps = entityCapsManager_.getCaps(contact_); + boolean hasCSN = (caps != null) && (caps.hasFeature(DiscoInfo.ChatStatesFeature)); + contactHas85Caps_ = hasCSN; + } + } + + public void setContact(JID contact) { + contactHasSentActive_ = false; + userIsTyping_ = false; + contactIsOnline_ = false; + contact_ = contact; + handleCapsChanged(contact_); + } + + public void addChatStateRequest(Message message) { + if (contactShouldReceiveStates()) { + message.addPayload(new ChatState(ChatState.ChatStateType.Active)); + } + } + + public void setUserIsTyping() { + boolean should = contactShouldReceiveStates(); + if (should && !userIsTyping_) { + userIsTyping_ = true; + changeState(ChatState.ChatStateType.Composing); + } + } + + public void userSentMessage() { + userIsTyping_ = false; + } + + public void userCancelledNewMessage() { + if (userIsTyping_) { + userIsTyping_ = false; + changeState(ChatState.ChatStateType.Active); + } + } + + public void receivedMessageFromContact(boolean hasActiveElement) { + contactHasSentActive_ = hasActiveElement; + } + + public void setContactIsOnline(boolean online) { + contactIsOnline_ = online; + } +} diff --git a/src/com/isode/stroke/disco/DummyEntityCapsProvider.java b/src/com/isode/stroke/disco/DummyEntityCapsProvider.java new file mode 100644 index 0000000..708de7c --- /dev/null +++ b/src/com/isode/stroke/disco/DummyEntityCapsProvider.java @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2010 Isode Limited. + * All rights reserved. + * See the COPYING file for more information. + */ +/* + * Copyright (c) 2015 Tarun Gupta. + * Licensed under the simplified BSD license. + * See Documentation/Licenses/BSD-simplified.txt for more information. + */ + +package com.isode.stroke.disco; + +import com.isode.stroke.disco.EntityCapsProvider; +import com.isode.stroke.jid.JID; +import com.isode.stroke.elements.DiscoInfo; +import java.util.Map; +import java.util.HashMap; + +public class DummyEntityCapsProvider extends EntityCapsProvider { + + public Map<JID, DiscoInfo> caps = new HashMap<JID, DiscoInfo>(); + + public DummyEntityCapsProvider() { + + } + + public DiscoInfo getCaps(JID jid) { + if(caps.containsKey(jid)) { + return caps.get(jid); + } + return null; + } +}
\ No newline at end of file |