From 54c842eace382724442f7b12f50462dab2e276a6 Mon Sep 17 00:00:00 2001
From: bontric <benjohnwie@gmail.com>
Date: Fri, 7 Sep 2018 20:00:33 +0200
Subject: [PATCH] update mailboxowner session (wip)
---
.../bramble/mailbox/MailboxOwnerSession.java | 29 ++++++++-----------
1 file changed, 12 insertions(+), 17 deletions(-)
diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxOwnerSession.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxOwnerSession.java
index bf31990da..ced27eae5 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxOwnerSession.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxOwnerSession.java
@@ -1,28 +1,27 @@
package org.briarproject.bramble.mailbox;
import org.briarproject.bramble.api.contact.ContactId;
+import org.briarproject.bramble.api.sync.SyncSession;
import org.briarproject.bramble.api.sync.SyncSessionFactory;
import org.briarproject.bramble.api.transport.KeyManager;
import org.briarproject.bramble.api.transport.StreamReaderFactory;
import org.briarproject.bramble.api.transport.StreamWriterFactory;
import org.briarproject.bramble.mailbox.protocol.MailboxProtocol;
-import org.briarproject.bramble.mailbox.protocol.MailboxRequestStore;
-import org.briarproject.bramble.mailbox.protocol.MailboxRequestSync;
import org.briarproject.bramble.mailbox.protocol.MailboxRequestTake;
import java.io.IOException;
import java.util.concurrent.Executor;
import java.util.logging.Logger;
-import static java.util.logging.Level.WARNING;
-import static org.briarproject.bramble.util.LogUtils.logException;
+import static java.util.logging.Level.INFO;
-class MailboxOwnerSession extends MailboxSession {
+class MailboxOwnerSession extends AbstractMailboxSession {
private static final Logger LOG =
Logger.getLogger(MailboxOwnerSession.class.getName());
private final Executor ioExecutor;
private final MailboxProtocol mailboxProtocol;
+ private SyncSession syncSession;
public MailboxOwnerSession(ContactId contactId, Executor ioExecutor,
KeyManager keyManager,
@@ -43,23 +42,19 @@ class MailboxOwnerSession extends MailboxSession {
@Override
public void run() {
ioExecutor.execute(() -> readRequests());
- runDuplexOutgoingSession();
- }
-
- @Override
- public void handleSync(MailboxRequestSync req) {
+ syncSession = createDuplexOutgoingSession();
try {
- handleSyncStream(req.getSyncStream());
+ syncSession.run();
} catch (IOException e) {
- logException(LOG, WARNING, e);
+ if (LOG.isLoggable(INFO))
+ LOG.info(e.toString());
}
}
@Override
- public void handleStore(MailboxRequestStore mailboxRequestStore) {
- }
-
- @Override
- public void handleTake(MailboxRequestTake mailboxRequestTake) {
+ public void handleTake(MailboxRequestTake mailboxRequestTake)
+ throws MailboxSessionHandleException {
+ throw new MailboxSessionHandleException(
+ "MailboxOwnerSession does not support the TAKE request");
}
}
--
GitLab