removed unnecessary variable in message class
This commit is contained in:
parent
71886ed2ab
commit
60d0881852
|
@ -161,7 +161,6 @@ public class PgpEngine {
|
||||||
}
|
}
|
||||||
message.setEncryptedBody(encryptedMessageBody
|
message.setEncryptedBody(encryptedMessageBody
|
||||||
.toString());
|
.toString());
|
||||||
message.ready = true;
|
|
||||||
callback.success(message);
|
callback.success(message);
|
||||||
break;
|
break;
|
||||||
case OpenPgpApi.RESULT_CODE_USER_INTERACTION_REQUIRED:
|
case OpenPgpApi.RESULT_CODE_USER_INTERACTION_REQUIRED:
|
||||||
|
@ -191,7 +190,6 @@ public class PgpEngine {
|
||||||
switch (result.getIntExtra(OpenPgpApi.RESULT_CODE,
|
switch (result.getIntExtra(OpenPgpApi.RESULT_CODE,
|
||||||
OpenPgpApi.RESULT_CODE_ERROR)) {
|
OpenPgpApi.RESULT_CODE_ERROR)) {
|
||||||
case OpenPgpApi.RESULT_CODE_SUCCESS:
|
case OpenPgpApi.RESULT_CODE_SUCCESS:
|
||||||
message.ready = true;
|
|
||||||
callback.success(message);
|
callback.success(message);
|
||||||
break;
|
break;
|
||||||
case OpenPgpApi.RESULT_CODE_USER_INTERACTION_REQUIRED:
|
case OpenPgpApi.RESULT_CODE_USER_INTERACTION_REQUIRED:
|
||||||
|
|
|
@ -55,8 +55,6 @@ public class Message extends AbstractEntity {
|
||||||
protected transient Conversation conversation = null;
|
protected transient Conversation conversation = null;
|
||||||
|
|
||||||
protected transient JingleConnection jingleConnection = null;
|
protected transient JingleConnection jingleConnection = null;
|
||||||
|
|
||||||
public boolean ready = true;
|
|
||||||
|
|
||||||
private Message() {
|
private Message() {
|
||||||
|
|
||||||
|
|
|
@ -376,7 +376,6 @@ public class XmppConnectionService extends Service {
|
||||||
if (conversation.getNextEncryption() == Message.ENCRYPTION_PGP) {
|
if (conversation.getNextEncryption() == Message.ENCRYPTION_PGP) {
|
||||||
getPgpEngine().encrypt(message, callback);
|
getPgpEngine().encrypt(message, callback);
|
||||||
} else {
|
} else {
|
||||||
message.ready = true;
|
|
||||||
callback.success(message);
|
callback.success(message);
|
||||||
}
|
}
|
||||||
} catch (FileBackend.ImageCopyException e) {
|
} catch (FileBackend.ImageCopyException e) {
|
||||||
|
|
Loading…
Reference in a new issue