Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-19 14:19:53 +01:00
Code Issues Projects Releases Wiki Activity

Replace MessagesCleanedUpEvent with ConversationMessagesDeletedEvent

Browse Source
This commit is contained in:
Torsten Grote
2021-02-26 11:45:07 -03:00
parent 644afe8995
commit ef37428714
4 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bramble-api/src/main/java/org/briarproject/bramble/api/cleanup/CleanupHook.java
View File

@@ -1,6 +1,5 @@
package org.briarproject.bramble.api.cleanup; package org.briarproject.bramble.api.cleanup;
import org.briarproject.bramble.api.cleanup.event.MessagesCleanedUpEvent;
import org.briarproject.bramble.api.db.DatabaseComponent; import org.briarproject.bramble.api.db.DatabaseComponent;
import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.db.DbException;
import org.briarproject.bramble.api.db.Transaction; import org.briarproject.bramble.api.db.Transaction;
@@ -19,8 +18,6 @@ public interface CleanupHook {
/** /**
* Called when the cleanup deadlines of one or more messages are reached. * Called when the cleanup deadlines of one or more messages are reached.
* When this method returns, a {@link MessagesCleanedUpEvent} will be
* broadcast.
* <p> * <p>
* The callee is not required to delete the messages, but the hook won't be * The callee is not required to delete the messages, but the hook won't be
* called again for these messages unless another cleanup timer is set (see * called again for these messages unless another cleanup timer is set (see

2
bramble-core/src/main/java/org/briarproject/bramble/cleanup/CleanupManagerImpl.java
View File

@@ -3,7 +3,6 @@ package org.briarproject.bramble.cleanup;
import org.briarproject.bramble.api.cleanup.CleanupHook; import org.briarproject.bramble.api.cleanup.CleanupHook;
import org.briarproject.bramble.api.cleanup.CleanupManager; import org.briarproject.bramble.api.cleanup.CleanupManager;
import org.briarproject.bramble.api.cleanup.event.CleanupTimerStartedEvent; import org.briarproject.bramble.api.cleanup.event.CleanupTimerStartedEvent;
import org.briarproject.bramble.api.cleanup.event.MessagesCleanedUpEvent;
import org.briarproject.bramble.api.db.DatabaseComponent; import org.briarproject.bramble.api.db.DatabaseComponent;
import org.briarproject.bramble.api.db.DatabaseExecutor; import org.briarproject.bramble.api.db.DatabaseExecutor;
import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.db.DbException;
@@ -146,7 +145,6 @@ class CleanupManagerImpl implements CleanupManager, Service, EventListener {
throw new IllegalStateException("No cleanup hook for " + cv); throw new IllegalStateException("No cleanup hook for " + cv);
} }
hook.deleteMessages(txn, groupId, messageIds); hook.deleteMessages(txn, groupId, messageIds);
txn.attach(new MessagesCleanedUpEvent(groupId, messageIds));
} }
} }

20
bramble-api/src/main/java/org/briarproject/bramble/api/cleanup/event/MessagesCleanedUpEvent.java → briar-api/src/main/java/org/briarproject/briar/api/autodelete/event/ConversationMessagesDeletedEvent.java
View File

@@ -1,8 +1,8 @@
package org.briarproject.bramble.api.cleanup.event; package org.briarproject.briar.api.autodelete.event;
import org.briarproject.bramble.api.contact.ContactId;
import org.briarproject.bramble.api.event.Event; import org.briarproject.bramble.api.event.Event;
import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
import org.briarproject.bramble.api.sync.GroupId;
import org.briarproject.bramble.api.sync.MessageId; import org.briarproject.bramble.api.sync.MessageId;
import java.util.Collection; import java.util.Collection;
@@ -10,24 +10,24 @@ import java.util.Collection;
import javax.annotation.concurrent.Immutable; import javax.annotation.concurrent.Immutable;
/** /**
* An event that is broadcast when one or more messages in a group are * An event that is broadcast when one or more messages
* cleaned up. * in the private conversation with a contact have been deleted.
*/ */
@Immutable @Immutable
@NotNullByDefault @NotNullByDefault
public class MessagesCleanedUpEvent extends Event { public class ConversationMessagesDeletedEvent extends Event {
private final GroupId groupId; private final ContactId contactId;
private final Collection<MessageId> messageIds; private final Collection<MessageId> messageIds;
public MessagesCleanedUpEvent(GroupId groupId, public ConversationMessagesDeletedEvent(ContactId contactId,
Collection<MessageId> messageIds) { Collection<MessageId> messageIds) {
this.groupId = groupId; this.contactId = contactId;
this.messageIds = messageIds; this.messageIds = messageIds;
} }
public GroupId getGroupId() { public ContactId getContactId() {
return groupId; return contactId;
} }
public Collection<MessageId> getMessageIds() { public Collection<MessageId> getMessageIds() {

3
briar-core/src/main/java/org/briarproject/briar/messaging/MessagingManagerImpl.java
View File

@@ -31,6 +31,7 @@ import org.briarproject.bramble.api.versioning.ClientVersioningManager.ClientVer
import org.briarproject.briar.api.attachment.AttachmentHeader; import org.briarproject.briar.api.attachment.AttachmentHeader;
import org.briarproject.briar.api.attachment.FileTooBigException; import org.briarproject.briar.api.attachment.FileTooBigException;
import org.briarproject.briar.api.autodelete.AutoDeleteManager; import org.briarproject.briar.api.autodelete.AutoDeleteManager;
import org.briarproject.briar.api.autodelete.event.ConversationMessagesDeletedEvent;
import org.briarproject.briar.api.client.MessageTracker; import org.briarproject.briar.api.client.MessageTracker;
import org.briarproject.briar.api.client.MessageTracker.GroupCount; import org.briarproject.briar.api.client.MessageTracker.GroupCount;
import org.briarproject.briar.api.conversation.ConversationManager.ConversationClient; import org.briarproject.briar.api.conversation.ConversationManager.ConversationClient;
@@ -532,6 +533,8 @@ class MessagingManagerImpl implements MessagingManager, IncomingMessageHook,
Collection<MessageId> messageIds) throws DbException { Collection<MessageId> messageIds) throws DbException {
for (MessageId m : messageIds) deleteMessage(txn, g, m); for (MessageId m : messageIds) deleteMessage(txn, g, m);
recalculateGroupCount(txn, g); recalculateGroupCount(txn, g);
ContactId c = getContactId(txn, g);
txn.attach(new ConversationMessagesDeletedEvent(c, messageIds));
} }
private void deleteMessage(Transaction txn, GroupId g, MessageId m) private void deleteMessage(Transaction txn, GroupId g, MessageId m)