diff options
author | iNPUTmice <daniel@gultsch.de> | 2014-09-12 17:53:42 +0200 |
---|---|---|
committer | iNPUTmice <daniel@gultsch.de> | 2014-09-12 17:53:42 +0200 |
commit | 83c3b33f18429dc8788c2b58a31d150bee553d10 (patch) | |
tree | f4451e53a65dd25fd434dcb08bdaad53137e987a /src/eu/siacs/conversations/xmpp | |
parent | cee898084ee27592d774c8f62f5be7fd1edf821b (diff) | |
parent | 73cba91c9b08ff512104897b32837f9824f1cd3e (diff) |
Merge branch 'development'
Diffstat (limited to 'src/eu/siacs/conversations/xmpp')
-rw-r--r-- | src/eu/siacs/conversations/xmpp/stanzas/MessagePacket.java | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/eu/siacs/conversations/xmpp/stanzas/MessagePacket.java b/src/eu/siacs/conversations/xmpp/stanzas/MessagePacket.java index 386d9dc8..4e7b532b 100644 --- a/src/eu/siacs/conversations/xmpp/stanzas/MessagePacket.java +++ b/src/eu/siacs/conversations/xmpp/stanzas/MessagePacket.java @@ -4,7 +4,6 @@ import eu.siacs.conversations.xml.Element; public class MessagePacket extends AbstractStanza { public static final int TYPE_CHAT = 0; - public static final int TYPE_UNKNOWN = 1; public static final int TYPE_NORMAL = 2; public static final int TYPE_GROUPCHAT = 3; public static final int TYPE_ERROR = 4; @@ -38,8 +37,6 @@ public class MessagePacket extends AbstractStanza { case TYPE_GROUPCHAT: this.setAttribute("type", "groupchat"); break; - case TYPE_UNKNOWN: - break; case TYPE_NORMAL: break; default: @@ -63,7 +60,7 @@ public class MessagePacket extends AbstractStanza { } else if (type.equals("headline")) { return TYPE_HEADLINE; } else { - return TYPE_UNKNOWN; + return TYPE_NORMAL; } } } |