From 362b3f396fa528c73d19ee261d6c4fddbe7dd8f1 Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Tue, 27 Nov 2018 11:43:54 -0200 Subject: [PATCH] Remove response messages right after storing them --- .../briar/introduction/AbstractProtocolEngine.java | 6 ++++++ .../privategroup/invitation/AbstractProtocolEngine.java | 6 ++++++ .../org/briarproject/briar/sharing/ProtocolEngineImpl.java | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/briar-core/src/main/java/org/briarproject/briar/introduction/AbstractProtocolEngine.java b/briar-core/src/main/java/org/briarproject/briar/introduction/AbstractProtocolEngine.java index 53ad74861..7516a7e86 100644 --- a/briar-core/src/main/java/org/briarproject/briar/introduction/AbstractProtocolEngine.java +++ b/briar-core/src/main/java/org/briarproject/briar/introduction/AbstractProtocolEngine.java @@ -29,6 +29,7 @@ import java.util.Map; import javax.annotation.Nullable; import javax.annotation.concurrent.Immutable; +import static java.util.logging.Logger.getLogger; import static org.briarproject.briar.introduction.MessageType.ABORT; import static org.briarproject.briar.introduction.MessageType.ACCEPT; import static org.briarproject.briar.introduction.MessageType.ACTIVATE; @@ -140,6 +141,11 @@ abstract class AbstractProtocolEngine visibleInConversation); try { clientHelper.addLocalMessage(txn, m, meta, true); + if (type != MessageType.REQUEST) { + getLogger("TEST").warning("DELETED MESSAGE AND METADATA"); + db.deleteMessage(txn, m.getId()); + db.deleteMessageMetadata(txn, m.getId()); + } } catch (FormatException e) { throw new AssertionError(e); } diff --git a/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/AbstractProtocolEngine.java b/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/AbstractProtocolEngine.java index aa018042e..9eea74b5d 100644 --- a/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/AbstractProtocolEngine.java +++ b/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/AbstractProtocolEngine.java @@ -29,6 +29,7 @@ import java.util.Map; import javax.annotation.Nullable; import javax.annotation.concurrent.Immutable; +import static java.util.logging.Logger.getLogger; import static org.briarproject.briar.api.privategroup.PrivateGroupManager.CLIENT_ID; import static org.briarproject.briar.api.privategroup.PrivateGroupManager.MAJOR_VERSION; import static org.briarproject.briar.privategroup.invitation.GroupInvitationConstants.GROUP_KEY_CONTACT_ID; @@ -224,6 +225,11 @@ abstract class AbstractProtocolEngine true, visibleInConversation, false, false); try { clientHelper.addLocalMessage(txn, m, meta, true); + if (type != MessageType.INVITE) { + getLogger("TEST").warning("DELETED MESSAGE AND METADATA"); + db.deleteMessage(txn, m.getId()); + db.deleteMessageMetadata(txn, m.getId()); + } } catch (FormatException e) { throw new AssertionError(e); } diff --git a/briar-core/src/main/java/org/briarproject/briar/sharing/ProtocolEngineImpl.java b/briar-core/src/main/java/org/briarproject/briar/sharing/ProtocolEngineImpl.java index b5741d031..f24c69ceb 100644 --- a/briar-core/src/main/java/org/briarproject/briar/sharing/ProtocolEngineImpl.java +++ b/briar-core/src/main/java/org/briarproject/briar/sharing/ProtocolEngineImpl.java @@ -28,6 +28,7 @@ import java.util.Map; import javax.annotation.Nullable; import javax.annotation.concurrent.Immutable; +import static java.util.logging.Logger.getLogger; import static org.briarproject.bramble.api.sync.Group.Visibility.INVISIBLE; import static org.briarproject.bramble.api.sync.Group.Visibility.SHARED; import static org.briarproject.bramble.api.sync.Group.Visibility.VISIBLE; @@ -568,6 +569,11 @@ abstract class ProtocolEngineImpl visibleInConversation, false, false); try { clientHelper.addLocalMessage(txn, m, meta, true); + if (type != MessageType.INVITE) { + getLogger("TEST").warning("DELETED MESSAGE AND METADATA"); + db.deleteMessage(txn, m.getId()); + db.deleteMessageMetadata(txn, m.getId()); + } } catch (FormatException e) { throw new AssertionError(e); }