aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-12-10 14:07:56 +0100
committeriNPUTmice <daniel@gultsch.de>2014-12-10 14:07:56 +0100
commit2b958e51df8655d63b713efa10870c40bdc42856 (patch)
tree3605e40dd62a7fd22b70ce96a3ed441d08f4621e /src
parent05d1f46c15e5f29531f2d8c237f34cd08da80ef7 (diff)
removed unnecessary otr error response
Diffstat (limited to '')
-rw-r--r--src/main/java/eu/siacs/conversations/parser/MessageParser.java4
-rw-r--r--src/main/java/eu/siacs/conversations/services/XmppConnectionService.java8
2 files changed, 0 insertions, 12 deletions
diff --git a/src/main/java/eu/siacs/conversations/parser/MessageParser.java b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
index 782675da..3ae82e48 100644
--- a/src/main/java/eu/siacs/conversations/parser/MessageParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
@@ -124,10 +124,6 @@ public class MessageParser extends AbstractParser implements
finishedMessage.setCounterpart(from);
return finishedMessage;
} catch (Exception e) {
- String receivedId = packet.getId();
- if (receivedId != null) {
- mXmppConnectionService.replyWithNotAcceptable(account, packet);
- }
conversation.resetOtrSession();
return null;
}
diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index 41a40224..2f44375e 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -1969,14 +1969,6 @@ public class XmppConnectionService extends Service {
return this.mBitmapCache;
}
- public void replyWithNotAcceptable(Account account, MessagePacket packet) {
- if (account.getStatus() == Account.State.ONLINE) {
- MessagePacket error = this.mMessageGenerator
- .generateNotAcceptable(packet);
- sendMessagePacket(account, error);
- }
- }
-
public void syncRosterToDisk(final Account account) {
new Thread(new Runnable() {