From 60d0881852d7b99a222918e4dba354ef6a3b0f5e Mon Sep 17 00:00:00 2001 From: iNPUTmice Date: Sat, 7 Jun 2014 14:42:17 +0200 Subject: [PATCH] removed unnecessary variable in message class --- src/eu/siacs/conversations/crypto/PgpEngine.java | 2 -- src/eu/siacs/conversations/entities/Message.java | 2 -- src/eu/siacs/conversations/services/XmppConnectionService.java | 1 - 3 files changed, 5 deletions(-) diff --git a/src/eu/siacs/conversations/crypto/PgpEngine.java b/src/eu/siacs/conversations/crypto/PgpEngine.java index 75c477685..c0d8ca074 100644 --- a/src/eu/siacs/conversations/crypto/PgpEngine.java +++ b/src/eu/siacs/conversations/crypto/PgpEngine.java @@ -161,7 +161,6 @@ public class PgpEngine { } message.setEncryptedBody(encryptedMessageBody .toString()); - message.ready = true; callback.success(message); break; case OpenPgpApi.RESULT_CODE_USER_INTERACTION_REQUIRED: @@ -191,7 +190,6 @@ public class PgpEngine { switch (result.getIntExtra(OpenPgpApi.RESULT_CODE, OpenPgpApi.RESULT_CODE_ERROR)) { case OpenPgpApi.RESULT_CODE_SUCCESS: - message.ready = true; callback.success(message); break; case OpenPgpApi.RESULT_CODE_USER_INTERACTION_REQUIRED: diff --git a/src/eu/siacs/conversations/entities/Message.java b/src/eu/siacs/conversations/entities/Message.java index 0f50f026f..c298a6522 100644 --- a/src/eu/siacs/conversations/entities/Message.java +++ b/src/eu/siacs/conversations/entities/Message.java @@ -55,8 +55,6 @@ public class Message extends AbstractEntity { protected transient Conversation conversation = null; protected transient JingleConnection jingleConnection = null; - - public boolean ready = true; private Message() { diff --git a/src/eu/siacs/conversations/services/XmppConnectionService.java b/src/eu/siacs/conversations/services/XmppConnectionService.java index 1d59692c8..10d7f409d 100644 --- a/src/eu/siacs/conversations/services/XmppConnectionService.java +++ b/src/eu/siacs/conversations/services/XmppConnectionService.java @@ -376,7 +376,6 @@ public class XmppConnectionService extends Service { if (conversation.getNextEncryption() == Message.ENCRYPTION_PGP) { getPgpEngine().encrypt(message, callback); } else { - message.ready = true; callback.success(message); } } catch (FileBackend.ImageCopyException e) {