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

Refactor ValidationManager and fix some bugs. #619

Browse Source
This commit is contained in:
akwizgran
2016-09-08 14:57:41 +01:00
parent fd4275733f
commit 8a3e5bfb50
34 changed files with 978 additions and 922 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
briar-core/src/org/briarproject/clients/ClientHelperImpl.java
View File

@@ -18,7 +18,6 @@ import org.briarproject.api.db.DatabaseComponent;
import org.briarproject.api.db.DbException;
import org.briarproject.api.db.Metadata;
import org.briarproject.api.db.Transaction;
import org.briarproject.api.sync.ClientId;
import org.briarproject.api.sync.GroupId;
import org.briarproject.api.sync.Message;
import org.briarproject.api.sync.MessageFactory;
@@ -62,11 +61,11 @@ class ClientHelperImpl implements ClientHelper {
}
@Override
public void addLocalMessage(Message m, ClientId c, BdfDictionary metadata,
public void addLocalMessage(Message m, BdfDictionary metadata,
boolean shared) throws DbException, FormatException {
Transaction txn = db.startTransaction(false);
try {
addLocalMessage(txn, m, c, metadata, shared);
addLocalMessage(txn, m, metadata, shared);
txn.setComplete();
} finally {
db.endTransaction(txn);
@@ -74,10 +73,10 @@ class ClientHelperImpl implements ClientHelper {
}
@Override
public void addLocalMessage(Transaction txn, Message m, ClientId c,
public void addLocalMessage(Transaction txn, Message m,
BdfDictionary metadata, boolean shared)
throws DbException, FormatException {
db.addLocalMessage(txn, m, c, metadataEncoder.encode(metadata), shared);
db.addLocalMessage(txn, m, metadataEncoder.encode(metadata), shared);
}
@Override

4
briar-core/src/org/briarproject/clients/MessageQueueManagerImpl.java
View File

@@ -16,10 +16,10 @@ import org.briarproject.api.sync.Group;
import org.briarproject.api.sync.GroupId;
import org.briarproject.api.sync.InvalidMessageException;
import org.briarproject.api.sync.Message;
import org.briarproject.api.sync.MessageContext;
import org.briarproject.api.sync.MessageId;
import org.briarproject.api.sync.ValidationManager;
import org.briarproject.api.sync.ValidationManager.IncomingMessageHook;
import org.briarproject.api.sync.MessageContext;
import org.briarproject.util.ByteUtils;
import java.util.ArrayList;
@@ -70,7 +70,7 @@ class MessageQueueManagerImpl implements MessageQueueManager {
saveQueueState(txn, queue.getId(), queueState);
QueueMessage q = queueMessageFactory.createMessage(queue.getId(),
timestamp, queuePosition, body);
db.addLocalMessage(txn, q, queue.getClientId(), meta, true);
db.addLocalMessage(txn, q, meta, true);
return q;
}