aboutsummaryrefslogtreecommitdiffstats
path: root/src/eu/siacs/conversations/crypto
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-09-08 20:09:44 +0200
committeriNPUTmice <daniel@gultsch.de>2014-09-08 20:09:44 +0200
commitb23f8bd472f5c6bc809dddd26dd69791c9ed7dd8 (patch)
tree70a97b915395bc95f7e65f19bfdc033291d5d91f /src/eu/siacs/conversations/crypto
parenta6f0f0cb6e7d8853ba0f30d3aee5c2842304f451 (diff)
introduced downloadable interface. reverted some of the changes made to OTR
Diffstat (limited to 'src/eu/siacs/conversations/crypto')
-rw-r--r--src/eu/siacs/conversations/crypto/OtrEngine.java16
1 files changed, 1 insertions, 15 deletions
diff --git a/src/eu/siacs/conversations/crypto/OtrEngine.java b/src/eu/siacs/conversations/crypto/OtrEngine.java
index 074301407..46dd714f1 100644
--- a/src/eu/siacs/conversations/crypto/OtrEngine.java
+++ b/src/eu/siacs/conversations/crypto/OtrEngine.java
@@ -174,21 +174,7 @@ public class OtrEngine implements OtrEngineHost {
@Override
public void messageFromAnotherInstanceReceived(SessionID id) {
- String jid = id.getAccountID();
- Conversation conversation = mXmppConnectionService
- .findOrCreateConversation(account, jid, false);
- Message error = new Message(conversation, null, Message.ENCRYPTION_OTR);
- conversation.getMessages().add(error);
- error.setStatus(Message.STATUS_RECEPTION_FAILED);
- mXmppConnectionService.databaseBackend.createMessage(error);
- SessionImpl session = conversation.getOtrSession();
- if (session != null
- && session.getSessionStatus() != SessionStatus.ENCRYPTED) {
- try {
- session.startSession();
- } catch (OtrException e) {
- }
- }
+ Log.d(Config.LOGTAG,"unreadable message received from "+id.getAccountID());
}
@Override