aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/xmpp/stanzas/MessagePacket.java
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2015-08-15 19:18:38 +0200
committerDaniel Gultsch <daniel@gultsch.de>2015-08-15 19:18:38 +0200
commit5501502e893f3a1a38881aac1d2acc14365f4d17 (patch)
tree71ab51f13a55c621a68aa26a6f32500e40f25b70 /src/main/java/eu/siacs/conversations/xmpp/stanzas/MessagePacket.java
parent11fbc3d79e5896a4ba7d7e0c0c68415824c7b8cd (diff)
parent83e1e6468e1ade8f70601195e8c0f2435fec9b25 (diff)
Merge branch 'depend_on_sm' into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/xmpp/stanzas/MessagePacket.java')
-rw-r--r--src/main/java/eu/siacs/conversations/xmpp/stanzas/MessagePacket.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/xmpp/stanzas/MessagePacket.java b/src/main/java/eu/siacs/conversations/xmpp/stanzas/MessagePacket.java
index 6b690912..941b4b5f 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/stanzas/MessagePacket.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/stanzas/MessagePacket.java
@@ -5,7 +5,7 @@ import android.util.Pair;
import eu.siacs.conversations.parser.AbstractParser;
import eu.siacs.conversations.xml.Element;
-public class MessagePacket extends AbstractStanza {
+public class MessagePacket extends AbstractAcknowledgeableStanza {
public static final int TYPE_CHAT = 0;
public static final int TYPE_NORMAL = 2;
public static final int TYPE_GROUPCHAT = 3;