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

DB support for private messages.

Browse Source
This commit is contained in:
akwizgran
2011-09-13 15:12:36 +01:00
parent de5caca578
commit 2670d7b821
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
components/net/sf/briar/db/DatabaseComponentImpl.java
View File

@@ -179,11 +179,11 @@ DatabaseCleaner.Callback {
protected boolean storeGroupMessage(Txn txn, Message m, ContactId sender) protected boolean storeGroupMessage(Txn txn, Message m, ContactId sender)
throws DbException { throws DbException {
if(m.getGroup() == null) throw new IllegalArgumentException(); if(m.getGroup() == null) throw new IllegalArgumentException();
boolean added = db.addMessage(txn, m); boolean stored = db.addMessage(txn, m);
// Mark the message as seen by the sender // Mark the message as seen by the sender
MessageId id = m.getId(); MessageId id = m.getId();
if(sender != null) db.setStatus(txn, sender, id, Status.SEEN); if(sender != null) db.setStatus(txn, sender, id, Status.SEEN);
if(added) { if(stored) {
// Mark the message as unseen by other contacts // Mark the message as unseen by other contacts
for(ContactId c : db.getContacts(txn)) { for(ContactId c : db.getContacts(txn)) {
if(!c.equals(sender)) db.setStatus(txn, c, id, Status.NEW); if(!c.equals(sender)) db.setStatus(txn, c, id, Status.NEW);
@@ -197,21 +197,25 @@ DatabaseCleaner.Callback {
bytesStoredSinceLastCheck += m.getSize(); bytesStoredSinceLastCheck += m.getSize();
} }
} }
return added; return stored;
} }
/**
* Attempts to store the given messages, received from the given contact,
* and returns true if any were stored.
*/
protected boolean storeMessages(Txn txn, ContactId c, protected boolean storeMessages(Txn txn, ContactId c,
Collection<Message> messages) throws DbException { Collection<Message> messages) throws DbException {
boolean anyAdded = false; boolean anyStored = false;
for(Message m : messages) { for(Message m : messages) {
if(m.getGroup() == null) { if(m.getGroup() == null) {
if(storePrivateMessage(txn, m, c, true)) anyAdded = true; if(storePrivateMessage(txn, m, c, true)) anyStored = true;
} else if(db.containsVisibleSubscription(txn, m.getGroup(), c, } else if(db.containsVisibleSubscription(txn, m.getGroup(), c,
m.getTimestamp())) { m.getTimestamp())) {
if(storeGroupMessage(txn, m, c)) anyAdded = true; if(storeGroupMessage(txn, m, c)) anyStored = true;
} }
} }
return anyAdded; return anyStored;
} }
/** /**
@@ -225,8 +229,7 @@ DatabaseCleaner.Callback {
protected boolean storePrivateMessage(Txn txn, Message m, ContactId c, protected boolean storePrivateMessage(Txn txn, Message m, ContactId c,
boolean incoming) throws DbException { boolean incoming) throws DbException {
if(m.getGroup() != null) throw new IllegalArgumentException(); if(m.getGroup() != null) throw new IllegalArgumentException();
boolean added = db.addMessage(txn, m); if(!db.addMessage(txn, m)) return false;
if(!added) return false;
MessageId id = m.getId(); MessageId id = m.getId();
if(incoming) db.setStatus(txn, c, id, Status.SEEN); if(incoming) db.setStatus(txn, c, id, Status.SEEN);
else db.setStatus(txn, c, id, Status.NEW); else db.setStatus(txn, c, id, Status.NEW);