Add transactions to methods in ForumManager

briar-api/src/main/java/org/briarproject/briar/api/forum/ForumManager.java

@@ -74,6 +74,11 @@ public interface ForumManager {
 	 */
 	Collection<Forum> getForums() throws DbException;
 
+	/**
+	 * Returns all forums to which the user subscribes.
+	 */
+	Collection<Forum> getForums(Transaction txn) throws DbException;
+
 	/**
 	 * Returns the text of the forum post with the given ID.
 	 */
@@ -92,8 +97,14 @@ public interface ForumManager {
 	/**
 	 * Returns the group count for the given forum.
 	 */
+	@Deprecated
 	GroupCount getGroupCount(GroupId g) throws DbException;
 
+	/**
+	 * Returns the group count for the given forum.
+	 */
+	GroupCount getGroupCount(Transaction txn, GroupId g) throws DbException;
+
 	/**
 	 * Marks a message as read or unread and updates the group count.
 	 */

briar-core/src/main/java/org/briarproject/briar/forum/ForumManagerImpl.java

@@ -165,8 +165,12 @@ class ForumManagerImpl extends BdfIncomingMessageHook implements ForumManager {
 
 	@Override
 	public Collection<Forum> getForums() throws DbException {
-		Collection<Group> groups = db.transactionWithResult(true, txn ->
+		return db.transactionWithResult(true, this::getForums);
-				db.getGroups(txn, CLIENT_ID, MAJOR_VERSION));
+	}
+
+	@Override
+	public Collection<Forum> getForums(Transaction txn) throws DbException {
+		Collection<Group> groups = db.getGroups(txn, CLIENT_ID, MAJOR_VERSION);
 		try {
 			List<Forum> forums = new ArrayList<>();
 			for (Group g : groups) forums.add(parseForum(g));
@@ -235,6 +239,12 @@ class ForumManagerImpl extends BdfIncomingMessageHook implements ForumManager {
 		return messageTracker.getGroupCount(g);
 	}
 
+	@Override
+	public GroupCount getGroupCount(Transaction txn, GroupId g)
+			throws DbException {
+		return messageTracker.getGroupCount(txn, g);
+	}
+
 	@Override
 	public void setReadFlag(GroupId g, MessageId m, boolean read)
 			throws DbException {