diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/AbstractMailboxSession.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/AbstractMailboxSession.java index 60eac959b30906c0554d445665ca2572c1fc0c9d..a7f16952cf43a3a6fa4a69a3e904e504f694eaa7 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/AbstractMailboxSession.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/AbstractMailboxSession.java @@ -74,7 +74,7 @@ abstract class AbstractMailboxSession { this.transportMaxIdleTime = transportMaxIdleTime; this.contactId = contactId; - registerSupportetRequest(END); + registerSupportedRequest(END); } abstract void run(); @@ -104,7 +104,7 @@ abstract class AbstractMailboxSession { } } - protected void registerSupportetRequest(MailboxMessage.TYPE t) { + protected void registerSupportedRequest(MailboxMessage.TYPE t) { LOG.info("Handler registered: " + activeHandlers.get()); activeHandlers.incrementAndGet(); switch (t) { 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 03e72afa6e30add9380f0b8982d7989741e60fdc..8aeb2a7c1e8fc0f02bc414d8dccb1fc1b8f3b08a 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,18 +1,14 @@ 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.MailboxMessage; import org.briarproject.bramble.mailbox.protocol.MailboxProtocol; -import org.briarproject.bramble.mailbox.protocol.MailboxRequestTake; -import java.io.IOException; import java.util.concurrent.Executor; -import java.util.logging.Level; import java.util.logging.Logger; import static java.util.logging.Level.INFO; @@ -34,8 +30,8 @@ class MailboxOwnerSession extends AbstractMailboxSession { streamReaderFactory, mailboxProtocol, transportMaxLatency, transportMaxIdleTime, contactId); - registerSupportetRequest(MailboxMessage.TYPE.SYNC); - registerSupportetRequest(MailboxMessage.TYPE.TAKE); + registerSupportedRequest(MailboxMessage.TYPE.SYNC); + registerSupportedRequest(MailboxMessage.TYPE.TAKE); } @Override diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/PrivateMailboxSession.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/PrivateMailboxSession.java index 8212361ca80d540d76e6318bdd39eabe591ccf71..430f2c274b0890863255be18ddc03fcfeaae7851 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/PrivateMailboxSession.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/PrivateMailboxSession.java @@ -3,7 +3,6 @@ package org.briarproject.bramble.mailbox; import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.mailbox.MailboxInfo; -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; @@ -40,7 +39,7 @@ class PrivateMailboxSession extends AbstractMailboxSession { transportMaxIdleTime, contactId); this.mailboxProtocol = mailboxProtocol; - registerSupportetRequest(MailboxMessage.TYPE.SYNC); + registerSupportedRequest(MailboxMessage.TYPE.SYNC); } /**