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

Add transactional getSharedWith() method to SharingManager.

Browse Source
This commit is contained in:
akwizgran
2021-01-27 15:33:57 +00:00
committed by Torsten Grote
parent 98619df867
commit d69406dfe3
2 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
briar-api/src/main/java/org/briarproject/briar/api/sharing/SharingManager.java
View File

@@ -3,6 +3,7 @@ package org.briarproject.briar.api.sharing;
import org.briarproject.bramble.api.contact.Contact; import org.briarproject.bramble.api.contact.Contact;
import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.contact.ContactId;
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.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
import org.briarproject.bramble.api.sync.GroupId; import org.briarproject.bramble.api.sync.GroupId;
import org.briarproject.briar.api.client.SessionId; import org.briarproject.briar.api.client.SessionId;
@@ -45,6 +46,12 @@ public interface SharingManager<S extends Shareable>
*/ */
Collection<Contact> getSharedWith(GroupId g) throws DbException; Collection<Contact> getSharedWith(GroupId g) throws DbException;
/**
* Returns all contacts with whom the given group is shared.
*/
Collection<Contact> getSharedWith(Transaction txn, GroupId g)
throws DbException;
/** /**
* Returns true if the group not already shared and no invitation is open * Returns true if the group not already shared and no invitation is open
*/ */

18
briar-core/src/main/java/org/briarproject/briar/sharing/SharingManagerImpl.java
View File

@@ -426,17 +426,17 @@ abstract class SharingManagerImpl<S extends Shareable>
@Override @Override
public Collection<Contact> getSharedWith(GroupId g) throws DbException { public Collection<Contact> getSharedWith(GroupId g) throws DbException {
return db.transactionWithResult(true, txn -> getSharedWith(txn, g));
}
@Override
public Collection<Contact> getSharedWith(Transaction txn, GroupId g)
throws DbException {
// TODO report also pending invitations // TODO report also pending invitations
Collection<Contact> contacts = new ArrayList<>(); Collection<Contact> contacts = new ArrayList<>();
Transaction txn = db.startTransaction(true); for (Contact c : db.getContacts(txn)) {
try { if (db.getGroupVisibility(txn, c.getId(), g) == SHARED)
for (Contact c : db.getContacts(txn)) { contacts.add(c);
if (db.getGroupVisibility(txn, c.getId(), g) == SHARED)
contacts.add(c);
}
db.commitTransaction(txn);
} finally {
db.endTransaction(txn);
} }
return contacts; return contacts;
} }