aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/eu/siacs/conversations/parser/MessageParser.java6
-rw-r--r--src/eu/siacs/conversations/services/XmppConnectionService.java5
2 files changed, 10 insertions, 1 deletions
diff --git a/src/eu/siacs/conversations/parser/MessageParser.java b/src/eu/siacs/conversations/parser/MessageParser.java
index f06158763..cd10d6c8a 100644
--- a/src/eu/siacs/conversations/parser/MessageParser.java
+++ b/src/eu/siacs/conversations/parser/MessageParser.java
@@ -56,7 +56,7 @@ public class MessageParser extends AbstractParser {
String foreignPresence = conversation.getOtrSession()
.getSessionID().getUserID();
if (!foreignPresence.equals(fromParts[1])) {
- conversation.resetOtrSession();
+ conversation.endOtrIfNeeded();
if (properlyAddressed) {
conversation.startOtrSession(
mXmppConnectionService.getApplicationContext(),
@@ -90,6 +90,10 @@ public class MessageParser extends AbstractParser {
finishedMessage.setTime(getTimestamp(packet));
return finishedMessage;
} catch (Exception e) {
+ String receivedId = packet.getId();
+ if (receivedId!=null) {
+ mXmppConnectionService.replyWithError(account,packet);
+ }
conversation.resetOtrSession();
return null;
}
diff --git a/src/eu/siacs/conversations/services/XmppConnectionService.java b/src/eu/siacs/conversations/services/XmppConnectionService.java
index 51192432c..6e36c9bcf 100644
--- a/src/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/eu/siacs/conversations/services/XmppConnectionService.java
@@ -1474,4 +1474,9 @@ public class XmppConnectionService extends Service {
public PowerManager getPowerManager() {
return this.pm;
}
+
+ public void replyWithError(Account account, MessagePacket packet) {
+ // TODO Auto-generated method stub
+
+ }
}