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

Basic database support for private messages.

Browse Source
This commit is contained in:
akwizgran
2011-09-13 14:43:48 +01:00
parent 2858c139fa
commit de5caca578
6 changed files with 113 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,7 @@
package net.sf.briar.db;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.logging.Level;
@@ -9,8 +10,8 @@ import java.util.logging.Logger;
import net.sf.briar.api.ContactId;
import net.sf.briar.api.Rating;
import net.sf.briar.api.db.DatabaseComponent;
import net.sf.briar.api.db.DbException;
import net.sf.briar.api.db.DatabaseListener;
import net.sf.briar.api.db.DbException;
import net.sf.briar.api.db.Status;
import net.sf.briar.api.protocol.AuthorId;
import net.sf.briar.api.protocol.Message;
@@ -175,8 +176,9 @@ DatabaseCleaner.Callback {
* <p>
* Locking: contacts read, messages write, messageStatuses write.
*/
protected boolean storeMessage(Txn txn, Message m, ContactId sender)
protected boolean storeGroupMessage(Txn txn, Message m, ContactId sender)
throws DbException {
if(m.getGroup() == null) throw new IllegalArgumentException();
boolean added = db.addMessage(txn, m);
// Mark the message as seen by the sender
MessageId id = m.getId();
@@ -198,6 +200,43 @@ DatabaseCleaner.Callback {
return added;
}
protected boolean storeMessages(Txn txn, ContactId c,
Collection<Message> messages) throws DbException {
boolean anyAdded = false;
for(Message m : messages) {
if(m.getGroup() == null) {
if(storePrivateMessage(txn, m, c, true)) anyAdded = true;
} else if(db.containsVisibleSubscription(txn, m.getGroup(), c,
m.getTimestamp())) {
if(storeGroupMessage(txn, m, c)) anyAdded = true;
}
}
return anyAdded;
}
/**
* If the given message is already in the database, returns false.
* Otherwise stores the message and marks it as new or seen with respect to
* the given contact, depending on whether the message is outgoing or
* incoming, respectively.
* <p>
* Locking: contacts read, messages write, messageStatuses write.
*/
protected boolean storePrivateMessage(Txn txn, Message m, ContactId c,
boolean incoming) throws DbException {
if(m.getGroup() != null) throw new IllegalArgumentException();
boolean added = db.addMessage(txn, m);
if(!added) return false;
MessageId id = m.getId();
if(incoming) db.setStatus(txn, c, id, Status.SEEN);
else db.setStatus(txn, c, id, Status.NEW);
// Count the bytes stored
synchronized(spaceLock) {
bytesStoredSinceLastCheck += m.getSize();
}
return true;
}
/**
* Iteratively updates the sendability of a message's ancestors to reflect
* a change in the message's sendability. Returns the number of ancestors