From 2b958e51df8655d63b713efa10870c40bdc42856 Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Wed, 10 Dec 2014 14:07:56 +0100
Subject: [PATCH] removed unnecessary otr error response

---
 .../java/eu/siacs/conversations/parser/MessageParser.java | 4 ----
 .../conversations/services/XmppConnectionService.java     | 8 --------
 2 files changed, 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 782675dad..3ae82e48c 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 41a40224c..2f44375ec 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() {