From f9dfbe3fa528bf79f42e671e21350d20af5331b4 Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Tue, 26 Mar 2019 14:35:19 -0300 Subject: [PATCH] Don't show remote introduction responses after declining locally Fixes #1514 --- .../briar/introduction/IntroduceeProtocolEngine.java | 11 ----------- .../introduction/IntroductionIntegrationTest.java | 6 +++--- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/briar-core/src/main/java/org/briarproject/briar/introduction/IntroduceeProtocolEngine.java b/briar-core/src/main/java/org/briarproject/briar/introduction/IntroduceeProtocolEngine.java index ae055bb9b..68a0a8d41 100644 --- a/briar-core/src/main/java/org/briarproject/briar/introduction/IntroduceeProtocolEngine.java +++ b/briar-core/src/main/java/org/briarproject/briar/introduction/IntroduceeProtocolEngine.java @@ -381,17 +381,6 @@ class IntroduceeProtocolEngine if (isInvalidDependency(s, m.getPreviousMessageId())) return abort(txn, s); - // Mark the response visible in the UI - markMessageVisibleInUi(txn, m.getMessageId()); - - // Track the incoming message - messageTracker - .trackMessage(txn, m.getGroupId(), m.getTimestamp(), false); - - // Broadcast IntroductionResponseReceivedEvent - broadcastIntroductionResponseReceivedEvent(txn, s, - s.getIntroducer().getId(), s.getRemote().author, m); - // Move to START state return IntroduceeSession.clear(s, START, s.getLastLocalMessageId(), s.getLocalTimestamp(), m.getMessageId()); diff --git a/briar-core/src/test/java/org/briarproject/briar/introduction/IntroductionIntegrationTest.java b/briar-core/src/test/java/org/briarproject/briar/introduction/IntroductionIntegrationTest.java index 4c65c6e9c..fe48ba387 100644 --- a/briar-core/src/test/java/org/briarproject/briar/introduction/IntroductionIntegrationTest.java +++ b/briar-core/src/test/java/org/briarproject/briar/introduction/IntroductionIntegrationTest.java @@ -399,7 +399,7 @@ public class IntroductionIntegrationTest assertEquals(3, messages.size()); messages = db2.transactionWithResult(true, txn -> introductionManager2.getMessageHeaders(txn, contactId0From2)); - assertEquals(3, messages.size()); + assertEquals(2, messages.size()); assertFalse(listener0.aborted); assertFalse(listener1.aborted); assertFalse(listener2.aborted); @@ -553,10 +553,10 @@ public class IntroductionIntegrationTest introductionManager0.getMessageHeaders(txn, contactId2From0)) .size()); assertGroupCount(messageTracker0, g2.getId(), 2, 1); - assertEquals(3, db1.transactionWithResult(true, txn -> + assertEquals(2, db1.transactionWithResult(true, txn -> introductionManager1.getMessageHeaders(txn, contactId0From1)) .size()); - assertGroupCount(messageTracker1, g1.getId(), 3, 2); + assertGroupCount(messageTracker1, g1.getId(), 2, 1); assertEquals(3, db2.transactionWithResult(true, txn -> introductionManager2.getMessageHeaders(txn, contactId0From2)) .size());