sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

delay notification until after pgp decryption

This commit is contained in:
Daniel Gultsch 2016-06-15 12:44:29 +02:00
parent e0575642b5
commit 5f40a7042d
7 changed files with 51 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/main/java/eu/siacs/conversations/crypto/PgpDecryptionService.java
View File

@ -14,6 +14,7 @@ import java.io.InputStream;
import java.io.OutputStream; import java.io.OutputStream;
import java.net.URL; import java.net.URL;
import java.util.ArrayDeque; import java.util.ArrayDeque;
import java.util.HashSet;
import java.util.List; import java.util.List;
import eu.siacs.conversations.entities.Conversation; import eu.siacs.conversations.entities.Conversation;
@ -28,6 +29,7 @@ public class PgpDecryptionService {
private OpenPgpApi openPgpApi = null; private OpenPgpApi openPgpApi = null;
protected final ArrayDeque<Message> messages = new ArrayDeque(); protected final ArrayDeque<Message> messages = new ArrayDeque();
protected final HashSet<Message> pendingNotifications = new HashSet<>();
Message currentMessage; Message currentMessage;
private PendingIntent pendingIntent; private PendingIntent pendingIntent;
@ -36,9 +38,16 @@ public class PgpDecryptionService {
this.mXmppConnectionService = service; this.mXmppConnectionService = service;
} }
public synchronized void decrypt(final Message message) { public synchronized boolean decrypt(final Message message, boolean notify) {
messages.add(message); messages.add(message);
continueDecryption(); if (notify && pendingIntent == null) {
pendingNotifications.add(message);
continueDecryption();
return false;
} else {
continueDecryption();
return notify;
}
} }
public synchronized void decrypt(final List<Message> list) { public synchronized void decrypt(final List<Message> list) {
@ -52,6 +61,7 @@ public class PgpDecryptionService {
public synchronized void discard(List<Message> discards) { public synchronized void discard(List<Message> discards) {
this.messages.removeAll(discards); this.messages.removeAll(discards);
this.pendingNotifications.removeAll(discards);
} }
protected synchronized void decryptNext() { protected synchronized void decryptNext() {
@ -113,9 +123,11 @@ public class PgpDecryptionService {
mXmppConnectionService.updateMessage(message); mXmppConnectionService.updateMessage(message);
break; break;
case OpenPgpApi.RESULT_CODE_USER_INTERACTION_REQUIRED: case OpenPgpApi.RESULT_CODE_USER_INTERACTION_REQUIRED:
messages.addFirst(message); synchronized (PgpDecryptionService.this) {
currentMessage = null; messages.addFirst(message);
storePendingIntent((PendingIntent) result.getParcelableExtra(OpenPgpApi.RESULT_INTENT)); currentMessage = null;
storePendingIntent((PendingIntent) result.getParcelableExtra(OpenPgpApi.RESULT_INTENT));
}
break; break;
case OpenPgpApi.RESULT_CODE_ERROR: case OpenPgpApi.RESULT_CODE_ERROR:
message.setEncryption(Message.ENCRYPTION_DECRYPTION_FAILED); message.setEncryption(Message.ENCRYPTION_DECRYPTION_FAILED);
@ -141,9 +153,11 @@ public class PgpDecryptionService {
mXmppConnectionService.updateMessage(message); mXmppConnectionService.updateMessage(message);
break; break;
case OpenPgpApi.RESULT_CODE_USER_INTERACTION_REQUIRED: case OpenPgpApi.RESULT_CODE_USER_INTERACTION_REQUIRED:
messages.addFirst(message); synchronized (PgpDecryptionService.this) {
currentMessage = null; messages.addFirst(message);
storePendingIntent((PendingIntent) result.getParcelableExtra(OpenPgpApi.RESULT_INTENT)); currentMessage = null;
storePendingIntent((PendingIntent) result.getParcelableExtra(OpenPgpApi.RESULT_INTENT));
}
break; break;
case OpenPgpApi.RESULT_CODE_ERROR: case OpenPgpApi.RESULT_CODE_ERROR:
message.setEncryption(Message.ENCRYPTION_DECRYPTION_FAILED); message.setEncryption(Message.ENCRYPTION_DECRYPTION_FAILED);
@ -155,6 +169,13 @@ public class PgpDecryptionService {
mXmppConnectionService.updateMessage(message); mXmppConnectionService.updateMessage(message);
} }
} }
notifyIfPending(message);
}
private synchronized void notifyIfPending(Message message) {
if (pendingNotifications.remove(message)) {
mXmppConnectionService.getNotificationService().push(message);
}
} }
private void storePendingIntent(PendingIntent pendingIntent) { private void storePendingIntent(PendingIntent pendingIntent) {

2
src/main/java/eu/siacs/conversations/entities/Conversation.java
View File

@ -774,7 +774,7 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
public boolean hasDuplicateMessage(Message message) { public boolean hasDuplicateMessage(Message message) {
synchronized (this.messages) { synchronized (this.messages) {
for (int i = this.messages.size() - 1; i >= 0; --i) { for (int i = this.messages.size() - 1; i >= 0; --i) {
if (this.messages.get(i).equals(message)) { if (this.messages.get(i).similar(message)) {
return true; return true;
} }
} }

2
src/main/java/eu/siacs/conversations/entities/Message.java
View File

@ -377,7 +377,7 @@ public class Message extends AbstractEntity {
this.transferable = transferable; this.transferable = transferable;
} }
public boolean equals(Message message) { public boolean similar(Message message) {
if (this.serverMsgId != null && message.getServerMsgId() != null) { if (this.serverMsgId != null && message.getServerMsgId() != null) {
return this.serverMsgId.equals(message.getServerMsgId()); return this.serverMsgId.equals(message.getServerMsgId());
} else if (this.body == null || this.counterpart == null) { } else if (this.body == null || this.counterpart == null) {

5
src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java
View File

@ -126,11 +126,12 @@ public class HttpDownloadConnection implements Transferable {
mXmppConnectionService.getFileBackend().updateMediaScanner(file); mXmppConnectionService.getFileBackend().updateMediaScanner(file);
message.setTransferable(null); message.setTransferable(null);
mHttpConnectionManager.finishConnection(this); mHttpConnectionManager.finishConnection(this);
boolean notify = acceptedAutomatically && !message.isRead();
if (message.getEncryption() == Message.ENCRYPTION_PGP) { if (message.getEncryption() == Message.ENCRYPTION_PGP) {
message.getConversation().getAccount().getPgpDecryptionService().decrypt(message); notify = message.getConversation().getAccount().getPgpDecryptionService().decrypt(message, notify);
} }
mXmppConnectionService.updateConversationUi(); mXmppConnectionService.updateConversationUi();
if (acceptedAutomatically) { if (notify) {
mXmppConnectionService.getNotificationService().push(message); mXmppConnectionService.getNotificationService().push(message);
} }
} }

14
src/main/java/eu/siacs/conversations/parser/MessageParser.java
View File

@ -342,6 +342,7 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece
final Jid to = packet.getTo(); final Jid to = packet.getTo();
final Jid from = packet.getFrom(); final Jid from = packet.getFrom();
final String remoteMsgId = packet.getId(); final String remoteMsgId = packet.getId();
boolean notify = false;
if (from == null) { if (from == null) {
Log.d(Config.LOGTAG,"no from in: "+packet.toString()); Log.d(Config.LOGTAG,"no from in: "+packet.toString());
@ -482,7 +483,7 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece
sendMessageReceipts(account, packet); sendMessageReceipts(account, packet);
} }
if (replacedMessage.getEncryption() == Message.ENCRYPTION_PGP) { if (replacedMessage.getEncryption() == Message.ENCRYPTION_PGP) {
conversation.getAccount().getPgpDecryptionService().decrypt(replacedMessage); conversation.getAccount().getPgpDecryptionService().decrypt(replacedMessage, false);
} }
return; return;
} else { } else {
@ -505,10 +506,6 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece
conversation.add(message); conversation.add(message);
} }
if (message.getEncryption() == Message.ENCRYPTION_PGP) {
conversation.getAccount().getPgpDecryptionService().decrypt(message);
}
if (query == null || query.getWith() == null) { //either no mam or catchup if (query == null || query.getWith() == null) { //either no mam or catchup
if (status == Message.STATUS_SEND || status == Message.STATUS_SEND_RECEIVED) { if (status == Message.STATUS_SEND || status == Message.STATUS_SEND_RECEIVED) {
mXmppConnectionService.markRead(conversation); mXmppConnectionService.markRead(conversation);
@ -517,9 +514,14 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece
} }
} else { } else {
message.markUnread(); message.markUnread();
notify = true;
} }
} }
if (message.getEncryption() == Message.ENCRYPTION_PGP) {
notify = conversation.getAccount().getPgpDecryptionService().decrypt(message, notify);
}
if (query == null) { if (query == null) {
mXmppConnectionService.updateConversationUi(); mXmppConnectionService.updateConversationUi();
} }
@ -541,7 +543,7 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece
final HttpConnectionManager manager = this.mXmppConnectionService.getHttpConnectionManager(); final HttpConnectionManager manager = this.mXmppConnectionService.getHttpConnectionManager();
if (message.trusted() && message.treatAsDownloadable() != Message.Decision.NEVER && manager.getAutoAcceptFileSize() > 0) { if (message.trusted() && message.treatAsDownloadable() != Message.Decision.NEVER && manager.getAutoAcceptFileSize() > 0) {
manager.createNewDownloadConnection(message); manager.createNewDownloadConnection(message);
} else if (!message.isRead()) { } else if (notify) {
if (query == null) { if (query == null) {
mXmppConnectionService.getNotificationService().push(message); mXmppConnectionService.getNotificationService().push(message);
} else if (query.getWith() == null) { // mam catchup } else if (query.getWith() == null) { // mam catchup

2
src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
View File

@ -695,7 +695,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
message.setEncryption(Message.ENCRYPTION_PGP); message.setEncryption(Message.ENCRYPTION_PGP);
activity.updateConversationList(); activity.updateConversationList();
updateMessages(); updateMessages();
conversation.getAccount().getPgpDecryptionService().decrypt(message); conversation.getAccount().getPgpDecryptionService().decrypt(message, false);
} }
protected void privateMessageWith(final Jid counterpart) { protected void privateMessageWith(final Jid counterpart) {

11
src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
View File

@ -99,9 +99,16 @@ public class JingleConnection implements Transferable {
mXmppConnectionService.markMessage(message,Message.STATUS_RECEIVED); mXmppConnectionService.markMessage(message,Message.STATUS_RECEIVED);
if (acceptedAutomatically) { if (acceptedAutomatically) {
message.markUnread(); message.markUnread();
JingleConnection.this.mXmppConnectionService.getNotificationService().push(message); if (message.getEncryption() == Message.ENCRYPTION_PGP) {
account.getPgpDecryptionService().decrypt(message, true);
} else {
JingleConnection.this.mXmppConnectionService.getNotificationService().push(message);
}
} }
} else { } else {
if (message.getEncryption() == Message.ENCRYPTION_PGP) {
account.getPgpDecryptionService().decrypt(message, false);
}
if (message.getEncryption() == Message.ENCRYPTION_PGP || message.getEncryption() == Message.ENCRYPTION_DECRYPTED) { if (message.getEncryption() == Message.ENCRYPTION_PGP || message.getEncryption() == Message.ENCRYPTION_DECRYPTED) {
file.delete(); file.delete();
} }
@ -109,8 +116,6 @@ public class JingleConnection implements Transferable {
Log.d(Config.LOGTAG,"successfully transmitted file:" + file.getAbsolutePath()+" ("+file.getSha1Sum()+")"); Log.d(Config.LOGTAG,"successfully transmitted file:" + file.getAbsolutePath()+" ("+file.getSha1Sum()+")");
if (message.getEncryption() != Message.ENCRYPTION_PGP) { if (message.getEncryption() != Message.ENCRYPTION_PGP) {
mXmppConnectionService.getFileBackend().updateMediaScanner(file); mXmppConnectionService.getFileBackend().updateMediaScanner(file);
} else {
account.getPgpDecryptionService().decrypt(message);
} }
} }