Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-12 10:49:06 +01:00
Code Issues Projects Releases Wiki Activity

Do not require an entire Message for the MessageSharedEvent

Browse Source
This commit is contained in:
Torsten Grote
2016-08-16 10:56:51 -03:00
parent eb3da2aac9
commit 743fc7dd1f
8 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
briar-api/src/org/briarproject/api/clients/ClientHelper.java
View File

@@ -72,7 +72,7 @@ public interface ClientHelper {
/**
* Marks the given message as shared or unshared with other contacts.
*/
void setMessageShared(Transaction txn, Message m, boolean shared)
void setMessageShared(Transaction txn, MessageId m, boolean shared)
throws DbException;
byte[] toByteArray(BdfDictionary dictionary) throws FormatException;

2
briar-api/src/org/briarproject/api/db/DatabaseComponent.java
View File

@@ -437,7 +437,7 @@ public interface DatabaseComponent {
/**
* Marks the given message as shared or unshared.
*/
void setMessageShared(Transaction txn, Message m, boolean shared)
void setMessageShared(Transaction txn, MessageId m, boolean shared)
throws DbException;
/**

12
briar-api/src/org/briarproject/api/event/MessageSharedEvent.java
View File

@@ -1,17 +1,17 @@
package org.briarproject.api.event;
import org.briarproject.api.sync.Message;
import org.briarproject.api.sync.MessageId;
/** An event that is broadcast when a message is shared. */
public class MessageSharedEvent extends Event {
private final Message message;
private final MessageId messageId;
public MessageSharedEvent(Message message) {
this.message = message;
public MessageSharedEvent(MessageId message) {
this.messageId = message;
}
public Message getMessage() {
return message;
public MessageId getMessageId() {
return messageId;
}
}

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

@@ -240,7 +240,7 @@ class ClientHelperImpl implements ClientHelper {
}
@Override
public void setMessageShared(Transaction txn, Message m, boolean shared)
public void setMessageShared(Transaction txn, MessageId m, boolean shared)
throws DbException {
db.setMessageShared(txn, m, shared);
}

8
briar-core/src/org/briarproject/db/DatabaseComponentImpl.java
View File

@@ -199,7 +199,7 @@ class DatabaseComponentImpl<T> implements DatabaseComponent {
transaction.attach(new MessageAddedEvent(m, null));
transaction.attach(new MessageStateChangedEvent(m, c, true,
DELIVERED));
if (shared) transaction.attach(new MessageSharedEvent(m));
if (shared) transaction.attach(new MessageSharedEvent(m.getId()));
}
db.mergeMessageMetadata(txn, m.getId(), meta);
}
@@ -704,13 +704,13 @@ class DatabaseComponentImpl<T> implements DatabaseComponent {
transaction.attach(new ContactStatusChangedEvent(c, active));
}
public void setMessageShared(Transaction transaction, Message m,
public void setMessageShared(Transaction transaction, MessageId m,
boolean shared) throws DbException {
if (transaction.isReadOnly()) throw new IllegalArgumentException();
T txn = unbox(transaction);
if (!db.containsMessage(txn, m.getId()))
if (!db.containsMessage(txn, m))
throw new NoSuchMessageException();
db.setMessageShared(txn, m.getId(), shared);
db.setMessageShared(txn, m, shared);
if (shared) transaction.attach(new MessageSharedEvent(m));
}

2
briar-core/src/org/briarproject/forum/ForumManagerImpl.java
View File

@@ -78,7 +78,7 @@ class ForumManagerImpl extends BdfIncomingMessageHook implements ForumManager {
protected void incomingMessage(Transaction txn, Message m, BdfList body,
BdfDictionary meta) throws DbException, FormatException {
clientHelper.setMessageShared(txn, m, true);
clientHelper.setMessageShared(txn, m.getId(), true);
ForumPostHeader post = getForumPostHeader(txn, m.getId(), meta);
ForumPostReceivedEvent event =

2
briar-tests/src/org/briarproject/blogs/BlogManagerImplTest.java
View File

@@ -192,7 +192,7 @@ public class BlogManagerImplTest extends BriarTestCase {
);
context.checking(new Expectations() {{
oneOf(clientHelper).setMessageShared(txn, message, true);
oneOf(clientHelper).setMessageShared(txn, messageId, true);
oneOf(identityManager)
.getAuthorStatus(txn, blog1.getAuthor().getId());
will(returnValue(VERIFIED));

2
briar-tests/src/org/briarproject/db/DatabaseComponentImplTest.java
View File

@@ -751,7 +751,7 @@ public class DatabaseComponentImplTest extends BriarTestCase {
transaction = db.startTransaction(false);
try {
db.setMessageShared(transaction, message, true);
db.setMessageShared(transaction, message.getId(), true);
fail();
} catch (NoSuchMessageException expected) {
// Expected