Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-11 18:29:05 +01:00
Code Issues Projects Releases Wiki Activity

Remove response messages right after storing them

Browse Source
This commit is contained in:
Torsten Grote
2018-11-27 11:43:54 -02:00
parent 008cf95741
commit 362b3f396f
3 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
briar-core/src/main/java/org/briarproject/briar/introduction/AbstractProtocolEngine.java
View File

@@ -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<S extends Session>
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);
}

6
briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/AbstractProtocolEngine.java
View File

@@ -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<S extends Session>
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);
}

6
briar-core/src/main/java/org/briarproject/briar/sharing/ProtocolEngineImpl.java
View File

@@ -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<S extends Shareable>
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);
}