Swiftdiff options
| author | Tarun Gupta <tarun1995gupta@gmail.com> | 2015-03-18 10:36:41 (GMT) |
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2015-03-19 18:28:55 (GMT) |
| commit | d62c9ba2dad0d9833c76452b5aa780a215548a5e (patch) | |
| tree | ff0ad21e1394dc2202c1d1e14d169c577a313b96 | |
| parent | 07117577091cee230bb0da8245856e19a9c7da8c (diff) | |
| download | stroke-d62c9ba2dad0d9833c76452b5aa780a215548a5e.zip stroke-d62c9ba2dad0d9833c76452b5aa780a215548a5e.tar.bz2 | |
Add functionality for ChatState.
Adds the Element, Parser, Serializer, ChatStateTracker and ChatStateSerializerTest.
License:
This patch is BSD-licensed, see Documentation/Licenses/BSD-simplified.txt for details.
Test-Information:
Ported serializer test from Swiften, which passes.
Change-Id: I314eda2db0f2be0499f8aa74d043319fb5cf57a8
8 files changed, 324 insertions, 2 deletions
diff --git a/src/com/isode/stroke/chat/ChatStateTracker.java b/src/com/isode/stroke/chat/ChatStateTracker.java new file mode 100644 index 0000000..c63d967 --- /dev/null +++ b/src/com/isode/stroke/chat/ChatStateTracker.java @@ -0,0 +1,62 @@ +/* + * 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.Presence; +import com.isode.stroke.elements.ChatState; +import com.isode.stroke.signals.Signal1; +import com.isode.stroke.base.NotNull; + +public class ChatStateTracker { + + private ChatState.ChatStateType currentState_; + public final Signal1<ChatState.ChatStateType> onChatStateChange = new Signal1<ChatState.ChatStateType>(); + + /** + * ChatStateTracker(); + */ + public ChatStateTracker() { + currentState_ = ChatState.ChatStateType.Gone; + } + + /** + * @param message, notnull + */ + public void handleMessageReceived(Message message) { + NotNull.exceptIfNull(message, "message"); + if (message.getType() == Message.Type.Error) { + return; + } + ChatState statePayload = message.getPayload(new ChatState()); + if (statePayload != null) { + changeState(statePayload.getChatState()); + } + } + + /** + * @param newPresence, notnull + */ + public void handlePresenceChange(Presence newPresence) { + NotNull.exceptIfNull(newPresence, "newPresence"); + if (newPresence.getType() == Presence.Type.Unavailable) { + onChatStateChange.emit(ChatState.ChatStateType.Gone); + } + } + + private void changeState(ChatState.ChatStateType state) { + if (state != currentState_) { + currentState_ = state; + onChatStateChange.emit(state); + } + } +} diff --git a/src/com/isode/stroke/elements/ChatState.java b/src/com/isode/stroke/elements/ChatState.java new file mode 100644 index 0000000..151eec4 --- /dev/null +++ b/src/com/isode/stroke/elements/ChatState.java @@ -0,0 +1,54 @@ +/* + * 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.elements; + +import com.isode.stroke.base.NotNull; +import com.isode.stroke.elements.Payload; + +public class ChatState extends Payload { + + public enum ChatStateType {Active, Composing, Paused, Inactive, Gone}; + + private ChatStateType state_; + + /** + * ChatState(); + */ + public ChatState() { + state_ = ChatStateType.Active; + } + + /** + * ChatState(state); + */ + public ChatState(ChatStateType state) { + NotNull.exceptIfNull(state, "state"); + state_ = state; + } + + /** + * + * @return state, notnull. + */ + public ChatStateType getChatState() { + return state_; + } + + /** + * + * @param state, notnull. + */ + public void setChatState(ChatStateType state) { + NotNull.exceptIfNull(state, "state"); + state_ = state; + } +}
\ No newline at end of file diff --git a/src/com/isode/stroke/parser/payloadparsers/ChatStateParser.java b/src/com/isode/stroke/parser/payloadparsers/ChatStateParser.java new file mode 100644 index 0000000..12da1e8 --- /dev/null +++ b/src/com/isode/stroke/parser/payloadparsers/ChatStateParser.java @@ -0,0 +1,61 @@ +/* + * 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.parser.payloadparsers; + +import com.isode.stroke.parser.GenericPayloadParser; +import com.isode.stroke.parser.AttributeMap; +import com.isode.stroke.elements.ChatState; +import com.isode.stroke.base.NotNull; + +public class ChatStateParser extends GenericPayloadParser<ChatState> { + + private int level_ = 0; + + /** + * ChatStateParser(); + */ + public ChatStateParser() { + super(new ChatState()); + } + + /** + * @param attributes, notnull. + */ + public void handleStartElement(String element, String ns, AttributeMap attributes) { + NotNull.exceptIfNull(element, "element"); + if (this.level_ == 0) { + ChatState.ChatStateType state = ChatState.ChatStateType.Active; + if (element.equals("active")) { + state = ChatState.ChatStateType.Active; + } else if (element.equals("composing")) { + state = ChatState.ChatStateType.Composing; + } else if (element.equals("inactive")) { + state = ChatState.ChatStateType.Inactive; + } else if (element.equals("paused")) { + state = ChatState.ChatStateType.Paused; + } else if (element.equals("gone")) { + state = ChatState.ChatStateType.Gone; + } + getPayloadInternal().setChatState(state); + } + ++level_; + } + + public void handleEndElement(String element, String ns) { + --level_; + } + + public void handleCharacterData(String data) { + + } + +}
\ No newline at end of file diff --git a/src/com/isode/stroke/parser/payloadparsers/ChatStateParserFactory.java b/src/com/isode/stroke/parser/payloadparsers/ChatStateParserFactory.java new file mode 100644 index 0000000..406ffef --- /dev/null +++ b/src/com/isode/stroke/parser/payloadparsers/ChatStateParserFactory.java @@ -0,0 +1,43 @@ +/* + * 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.parser.payloadparsers; + +import com.isode.stroke.parser.PayloadParserFactory; +import com.isode.stroke.parser.payloadparsers.ChatStateParser; +import com.isode.stroke.parser.AttributeMap; +import com.isode.stroke.parser.PayloadParser; + +public class ChatStateParserFactory implements PayloadParserFactory { + + /** + * ChatStateParserFactory(); + */ + public ChatStateParserFactory() { + + } + + /** + * @param attributes, notnull + */ + public boolean canParse(String element, String ns, AttributeMap attributes) { + return ((ns.equals("http://jabber.org/protocol/chatstates")) && + (element.equals("active") || element.equals("composing") || element.equals("paused") || element.equals("inactive") || element.equals("gone"))); + } + + /** + * @return PayloadParser() + */ + public PayloadParser createPayloadParser() { + return (new ChatStateParser()); + } +} + diff --git a/src/com/isode/stroke/parser/payloadparsers/FullPayloadParserFactoryCollection.java b/src/com/isode/stroke/parser/payloadparsers/FullPayloadParserFactoryCollection.java index e9d0fc1..5236d42 100644 --- a/src/com/isode/stroke/parser/payloadparsers/FullPayloadParserFactoryCollection.java +++ b/src/com/isode/stroke/parser/payloadparsers/FullPayloadParserFactoryCollection.java @@ -47,7 +47,7 @@ public class FullPayloadParserFactoryCollection extends PayloadParserFactoryColl //addFactory(new VCardUpdateParserFactory()); //addFactory(new VCardParserFactory()); //addFactory(new PrivateStorageParserFactory(this)); - //addFactory(new ChatStateParserFactory()); + addFactory(new ChatStateParserFactory()); //addFactory(new DelayParserFactory()); addFactory(new MUCUserPayloadParserFactory(this)); addFactory(new MUCOwnerPayloadParserFactory(this)); diff --git a/src/com/isode/stroke/serializer/payloadserializers/ChatStateSerializer.java b/src/com/isode/stroke/serializer/payloadserializers/ChatStateSerializer.java new file mode 100644 index 0000000..f11ccea --- /dev/null +++ b/src/com/isode/stroke/serializer/payloadserializers/ChatStateSerializer.java @@ -0,0 +1,49 @@ +/* + * 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.serializer.payloadserializers; + +import com.isode.stroke.serializer.GenericPayloadSerializer; +import com.isode.stroke.elements.ChatState; +import com.isode.stroke.base.NotNull; + +public class ChatStateSerializer extends GenericPayloadSerializer<ChatState> { + + /** + * CapsInfoSerializer(); + */ + public ChatStateSerializer() { + super(ChatState.class); + } + + /** + * @param chatState, notnull + */ + @Override + protected String serializePayload(ChatState chatState) { + NotNull.exceptIfNull(chatState, "chatState"); + String result = "<"; + ChatState.ChatStateType state = chatState.getChatState(); + if (state == ChatState.ChatStateType.Active) { + result = result.concat("active"); + } else if (state == ChatState.ChatStateType.Composing) { + result = result.concat("composing"); + } else if (state == ChatState.ChatStateType.Paused) { + result = result.concat("paused"); + } else if (state == ChatState.ChatStateType.Inactive) { + result = result.concat("inactive"); + } else if (state == ChatState.ChatStateType.Gone) { + result = result.concat("gone"); + } + result = result.concat(" xmlns=\"http://jabber.org/protocol/chatstates\"/>"); + return result; + } +}
\ No newline at end of file diff --git a/src/com/isode/stroke/serializer/payloadserializers/FullPayloadSerializerCollection.java b/src/com/isode/stroke/serializer/payloadserializers/FullPayloadSerializerCollection.java index 83a252f..0b62e0f 100644 --- a/src/com/isode/stroke/serializer/payloadserializers/FullPayloadSerializerCollection.java +++ b/src/com/isode/stroke/serializer/payloadserializers/FullPayloadSerializerCollection.java @@ -23,7 +23,7 @@ public class FullPayloadSerializerCollection extends PayloadSerializerCollection //addSerializer(new IBBSerializer()); addSerializer(new BodySerializer()); addSerializer(new SubjectSerializer()); - //addSerializer(new ChatStateSerializer()); + addSerializer(new ChatStateSerializer()); //addSerializer(new PrioritySerializer()); addSerializer(new ErrorSerializer()); addSerializer(new RosterSerializer()); diff --git a/test/com/isode/stroke/serializer/payloadserializers/ChatStateSerializerTest.java b/test/com/isode/stroke/serializer/payloadserializers/ChatStateSerializerTest.java new file mode 100644 index 0000000..50ee188 --- /dev/null +++ b/test/com/isode/stroke/serializer/payloadserializers/ChatStateSerializerTest.java @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2015 Tarun Gupta. + * Licensed under the simplified BSD license. + * See Documentation/Licenses/BSD-simplified.txt for more information. + */ + +package com.isode.stroke.serializer.payloadserializers; + +import static org.junit.Assert.assertEquals; +import org.junit.BeforeClass; +import org.junit.Test; +import com.isode.stroke.elements.ChatState; +import com.isode.stroke.serializer.payloadserializers.ChatStateSerializer; + +public class ChatStateSerializerTest { + + ChatStateSerializer testling = new ChatStateSerializer(); + + @Test + public void testSerialize_ActiveState() { + ChatState priority = new ChatState(ChatState.ChatStateType.Active); + String expected = "<active xmlns=\"http://jabber.org/protocol/chatstates\"/>"; + assertEquals(expected, testling.serialize(priority)); + } + + @Test + public void testSerialize_GoneState() { + ChatState priority = new ChatState(ChatState.ChatStateType.Gone); + String expected = "<gone xmlns=\"http://jabber.org/protocol/chatstates\"/>"; + assertEquals(expected, testling.serialize(priority)); + } + + @Test + public void testSerialize_ComposingState() { + ChatState priority = new ChatState(ChatState.ChatStateType.Composing); + String expected = "<composing xmlns=\"http://jabber.org/protocol/chatstates\"/>"; + assertEquals(expected, testling.serialize(priority)); + } + + @Test + public void testSerialize_PausedState() { + ChatState priority = new ChatState(ChatState.ChatStateType.Paused); + String expected = "<paused xmlns=\"http://jabber.org/protocol/chatstates\"/>"; + assertEquals(expected, testling.serialize(priority)); + } + + @Test + public void testSerialize_InactiveState() { + ChatState priority = new ChatState(ChatState.ChatStateType.Inactive); + String expected = "<inactive xmlns=\"http://jabber.org/protocol/chatstates\"/>"; + assertEquals(expected, testling.serialize(priority)); + } +}
\ No newline at end of file |