Merge remote-tracking branch 'refs/remotes/siacs/master'

1 files changed, 1 insertions, 22 deletions

diff --git a/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java
index a86002862..e29ebb52c 100644
--- a/src/main/java/eu/siacs/conversations/entities/Conversation.java
+++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java
@@ -655,23 +655,6 @@ public class Conversation extends AbstractEntity implements Blockable {
 		return this.nextCounterpart;
 	}
 
-	private int getMostRecentlyUsedOutgoingEncryption() {
-		synchronized (this.messages) {
-			for(int i = this.messages.size() -1; i >= 0; --i) {
-				final Message m = this.messages.get(i);
-				if (!m.isCarbon() && m.getStatus() != Message.STATUS_RECEIVED) {
-					final int e = m.getEncryption();
-					if (e == Message.ENCRYPTION_DECRYPTED || e == Message.ENCRYPTION_DECRYPTION_FAILED) {
-						return Message.ENCRYPTION_PGP;
-					} else {
-						return e;
-					}
-				}
-			}
-		}
-		return Message.ENCRYPTION_NONE;
-	}
-
 	private int getMostRecentlyUsedIncomingEncryption() {
 		synchronized (this.messages) {
 			for(int i = this.messages.size() -1; i >= 0; --i) {
@@ -700,12 +683,8 @@ public class Conversation extends AbstractEntity implements Blockable {
 					&& getAccount().getSelfContact().getPresences().allOrNonSupport(AxolotlService.PEP_DEVICE_LIST_NOTIFY)
 					&& getContact().getPresences().allOrNonSupport(AxolotlService.PEP_DEVICE_LIST_NOTIFY)) {
 				return Message.ENCRYPTION_AXOLOTL;
-			}
-			int outgoing = this.getMostRecentlyUsedOutgoingEncryption();
-			if (outgoing == Message.ENCRYPTION_NONE) {
-				next = this.getMostRecentlyUsedIncomingEncryption();
 			} else {
-				next = outgoing;
+				next = this.getMostRecentlyUsedIncomingEncryption();
 			}
 		}