Create a basic ConversationManager for querying GroupCount

This is also lays the groundwork for #384

briar-core/src/org/briarproject/messaging/ConversationManagerImpl.java

@@ -0,0 +1,76 @@
+package org.briarproject.messaging;
+
+import org.briarproject.api.clients.ContactGroupFactory;
+import org.briarproject.api.clients.MessageTracker.GroupCount;
+import org.briarproject.api.contact.Contact;
+import org.briarproject.api.contact.ContactId;
+import org.briarproject.api.db.DatabaseComponent;
+import org.briarproject.api.db.DbException;
+import org.briarproject.api.db.Transaction;
+import org.briarproject.api.messaging.ConversationManager;
+import org.briarproject.api.sync.Group;
+import org.briarproject.api.sync.GroupId;
+
+import java.util.Set;
+import java.util.concurrent.CopyOnWriteArraySet;
+
+import javax.inject.Inject;
+
+class ConversationManagerImpl implements ConversationManager {
+
+	private final DatabaseComponent db;
+	private final ContactGroupFactory contactGroupFactory;
+	private final Set<ConversationClient> clients;
+
+	@Inject
+	ConversationManagerImpl(DatabaseComponent db,
+			ContactGroupFactory contactGroupFactory) {
+		this.db = db;
+		this.contactGroupFactory = contactGroupFactory;
+		clients = new CopyOnWriteArraySet<ConversationClient>();
+	}
+
+	@Override
+	public void registerConversationClient(ConversationClient client) {
+		clients.add(client);
+	}
+
+	@Override
+	public GroupId getConversationId(ContactId contactId) throws DbException {
+		// TODO we should probably transition this to its own group
+		//      and/or work with the ContactId in the UI instead
+		Contact contact;
+		Transaction txn = db.startTransaction(true);
+		try {
+			contact = db.getContact(txn, contactId);
+			txn.setComplete();
+		} finally {
+			db.endTransaction(txn);
+		}
+		Group group = contactGroupFactory
+				.createContactGroup(MessagingManagerImpl.CLIENT_ID, contact);
+		return group.getId();
+	}
+
+	@Override
+	public GroupCount getGroupCount(ContactId contactId)
+			throws DbException {
+
+		long msgCount = 0, unreadCount = 0, latestTime = 0;
+		Transaction txn = db.startTransaction(true);
+		try {
+			for (ConversationClient client : clients) {
+				GroupCount count = client.getGroupCount(txn, contactId);
+				msgCount += count.getMsgCount();
+				unreadCount += count.getUnreadCount();
+				if (count.getLatestMsgTime() > latestTime)
+					latestTime = count.getLatestMsgTime();
+			}
+			txn.setComplete();
+		} finally {
+			db.endTransaction(txn);
+		}
+		return new GroupCount(msgCount, unreadCount, latestTime);
+	}
+
+}

briar-core/src/org/briarproject/messaging/MessagingManagerImpl.java

@@ -24,7 +24,7 @@ import org.briarproject.api.sync.GroupId;
 import org.briarproject.api.sync.Message;
 import org.briarproject.api.sync.MessageId;
 import org.briarproject.api.sync.MessageStatus;
-import org.briarproject.clients.BdfIncomingMessageHook;
+import org.briarproject.clients.ConversationClient;
 import org.briarproject.util.StringUtils;
 
 import java.util.ArrayList;
@@ -35,7 +35,7 @@ import javax.inject.Inject;
 
 import static org.briarproject.clients.BdfConstants.MSG_KEY_READ;
 
-class MessagingManagerImpl extends BdfIncomingMessageHook
+class MessagingManagerImpl extends ConversationClient
 		implements MessagingManager, Client, AddContactHook, RemoveContactHook {
 
 	static final ClientId CLIENT_ID = new ClientId(StringUtils.fromHexString(
@@ -77,7 +77,8 @@ class MessagingManagerImpl extends BdfIncomingMessageHook
 		}
 	}
 
-	private Group getContactGroup(Contact c) {
+	@Override
+	protected Group getContactGroup(Contact c) {
 		return contactGroupFactory.createContactGroup(CLIENT_ID, c);
 	}
 
@@ -203,4 +204,14 @@ class MessagingManagerImpl extends BdfIncomingMessageHook
 		}
 	}
 
+	@Override
+	public GroupCount getGroupCount(Transaction txn, ContactId contactId)
+			throws DbException {
+
+		Contact contact = db.getContact(txn, contactId);
+		GroupId groupId = getContactGroup(contact).getId();
+
+		return getGroupCount(txn, groupId);
+	}
+
 }

briar-core/src/org/briarproject/messaging/MessagingModule.java

@@ -4,6 +4,7 @@ import org.briarproject.api.clients.ClientHelper;
 import org.briarproject.api.contact.ContactManager;
 import org.briarproject.api.data.MetadataEncoder;
 import org.briarproject.api.lifecycle.LifecycleManager;
+import org.briarproject.api.messaging.ConversationManager;
 import org.briarproject.api.messaging.MessagingManager;
 import org.briarproject.api.messaging.PrivateMessageFactory;
 import org.briarproject.api.sync.ValidationManager;
@@ -22,6 +23,7 @@ public class MessagingModule {
 
 	public static class EagerSingletons {
 		@Inject MessagingManager messagingManager;
+		@Inject ConversationManager conversationManager;
 		@Inject PrivateMessageValidator privateMessageValidator;
 	}
 
@@ -46,12 +48,22 @@ public class MessagingModule {
 	@Singleton
 	MessagingManager getMessagingManager(LifecycleManager lifecycleManager,
 			ContactManager contactManager, ValidationManager validationManager,
+			ConversationManager conversationManager,
 			MessagingManagerImpl messagingManager) {
 		lifecycleManager.registerClient(messagingManager);
 		contactManager.registerAddContactHook(messagingManager);
 		contactManager.registerRemoveContactHook(messagingManager);
 		validationManager
 				.registerIncomingMessageHook(CLIENT_ID, messagingManager);
+		conversationManager.registerConversationClient(messagingManager);
 		return messagingManager;
 	}
+
+	@Provides
+	@Singleton
+	ConversationManager getConversationManager(
+			ConversationManagerImpl conversationManager) {
+		return conversationManager;
+	}
+
 }