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

Broadcast GroupMessageAddedEvent for the UI to update when received

Browse Source
This commit is contained in:
Torsten Grote
2016-11-07 11:36:17 -02:00
parent ce53589c33
commit d11ee5e43b
1 changed files with 29 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
briar-core/src/org/briarproject/privategroup/PrivateGroupManagerImpl.java
View File

@@ -12,6 +12,7 @@ import org.briarproject.api.db.DbException;
import org.briarproject.api.db.Transaction; import org.briarproject.api.db.Transaction;
import org.briarproject.api.event.Event; import org.briarproject.api.event.Event;
import org.briarproject.api.event.GroupDissolvedEvent; import org.briarproject.api.event.GroupDissolvedEvent;
import org.briarproject.api.event.GroupMessageAddedEvent;
import org.briarproject.api.identity.Author; import org.briarproject.api.identity.Author;
import org.briarproject.api.identity.Author.Status; import org.briarproject.api.identity.Author.Status;
import org.briarproject.api.identity.AuthorId; import org.briarproject.api.identity.AuthorId;
@@ -36,6 +37,7 @@ import org.briarproject.util.StringUtils;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
@@ -197,15 +199,22 @@ public class PrivateGroupManagerImpl extends BdfIncomingMessageHook implements
throws DbException { throws DbException {
Transaction txn = db.startTransaction(false); Transaction txn = db.startTransaction(false);
try { try {
// store message and metadata
BdfDictionary meta = new BdfDictionary(); BdfDictionary meta = new BdfDictionary();
meta.put(KEY_TYPE, POST.getInt()); meta.put(KEY_TYPE, POST.getInt());
if (m.getParent() != null) if (m.getParent() != null)
meta.put(KEY_PARENT_MSG_ID, m.getParent()); meta.put(KEY_PARENT_MSG_ID, m.getParent());
addMessageMetadata(meta, m, true); addMessageMetadata(meta, m, true);
GroupId g = m.getMessage().getGroupId();
clientHelper.addLocalMessage(txn, m.getMessage(), meta, true); clientHelper.addLocalMessage(txn, m.getMessage(), meta, true);
setPreviousMsgId(txn, m.getMessage().getGroupId(),
m.getMessage().getId()); // track message
setPreviousMsgId(txn, g, m.getMessage().getId());
trackOutgoingMessage(txn, m.getMessage()); trackOutgoingMessage(txn, m.getMessage());
// broadcast event
attachGroupMessageAddedEvent(txn, m.getMessage(), meta, true);
db.commitTransaction(txn); db.commitTransaction(txn);
} catch (FormatException e) { } catch (FormatException e) {
throw new DbException(e); throw new DbException(e);
@@ -355,6 +364,13 @@ public class PrivateGroupManagerImpl extends BdfIncomingMessageHook implements
status, read); status, read);
} }
private GroupMessageHeader getGroupMessageHeader(Transaction txn, GroupId g,
MessageId id, BdfDictionary meta)
throws DbException, FormatException {
return getGroupMessageHeader(txn, g, id, meta,
Collections.<AuthorId, Status>emptyMap());
}
@Override @Override
public Collection<GroupMember> getMembers(GroupId g) throws DbException { public Collection<GroupMember> getMembers(GroupId g) throws DbException {
Transaction txn = db.startTransaction(true); Transaction txn = db.startTransaction(true);
@@ -423,6 +439,7 @@ public class PrivateGroupManagerImpl extends BdfIncomingMessageHook implements
case JOIN: case JOIN:
addMember(txn, m.getGroupId(), getAuthor(meta)); addMember(txn, m.getGroupId(), getAuthor(meta));
trackIncomingMessage(txn, m); trackIncomingMessage(txn, m);
attachGroupMessageAddedEvent(txn, m, meta, false);
return true; return true;
case POST: case POST:
// timestamp must be greater than the timestamps of parent post // timestamp must be greater than the timestamps of parent post
@@ -455,6 +472,7 @@ public class PrivateGroupManagerImpl extends BdfIncomingMessageHook implements
if (previousType != JOIN && previousType != POST) if (previousType != JOIN && previousType != POST)
throw new FormatException(); throw new FormatException();
trackIncomingMessage(txn, m); trackIncomingMessage(txn, m);
attachGroupMessageAddedEvent(txn, m, meta, false);
return true; return true;
default: default:
// the validator should only let valid types pass // the validator should only let valid types pass
@@ -462,6 +480,15 @@ public class PrivateGroupManagerImpl extends BdfIncomingMessageHook implements
} }
} }
private void attachGroupMessageAddedEvent(Transaction txn, Message m,
BdfDictionary meta, boolean local)
throws DbException, FormatException {
GroupMessageHeader h =
getGroupMessageHeader(txn, m.getGroupId(), m.getId(), meta);
Event e = new GroupMessageAddedEvent(m.getGroupId(), h, local);
txn.attach(e);
}
private void addMember(Transaction txn, GroupId g, Author a) private void addMember(Transaction txn, GroupId g, Author a)
throws DbException, FormatException { throws DbException, FormatException {