diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxManagerImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxManagerImpl.java index 3a9283316a046e56e6aa3b80cbb81dd8dc093327..8c9c76223536826f12be5908d6ec1e32b23a612e 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxManagerImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxManagerImpl.java @@ -23,6 +23,8 @@ import org.briarproject.bramble.api.transport.StreamReaderFactory; import org.briarproject.bramble.api.transport.StreamWriter; import org.briarproject.bramble.api.transport.StreamWriterFactory; import org.briarproject.bramble.mailbox.protocol.MailboxProtocol; +import org.briarproject.bramble.mailbox.sessions.MailboxSessionFactory; +import org.briarproject.bramble.mailbox.sessions.PrivateMailboxSession; import java.io.EOFException; import java.io.IOException; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxModule.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxModule.java index ac73a278c2715e73af4a482ed914cbce22210a41..e2f3ad3a33fdf223c57c6c61ada4fbfe26f554c8 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxModule.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxModule.java @@ -3,6 +3,8 @@ package org.briarproject.bramble.mailbox; import org.briarproject.bramble.api.lifecycle.LifecycleManager; import org.briarproject.bramble.api.mailbox.MailboxManager; import org.briarproject.bramble.api.mailbox.MailboxService; +import org.briarproject.bramble.mailbox.sessions.MailboxSessionFactory; +import org.briarproject.bramble.mailbox.sessions.MailboxSessionFactoryImpl; import javax.inject.Singleton; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/AbstractMailboxSession.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/sessions/AbstractMailboxSession.java similarity index 99% rename from bramble-core/src/main/java/org/briarproject/bramble/mailbox/AbstractMailboxSession.java rename to bramble-core/src/main/java/org/briarproject/bramble/mailbox/sessions/AbstractMailboxSession.java index 23df67adcee6e706e3be4df35c921509035348d7..d39e05cf5441f77997c0e6802a71486154ae5cd5 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/AbstractMailboxSession.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/sessions/AbstractMailboxSession.java @@ -1,4 +1,4 @@ -package org.briarproject.bramble.mailbox; +package org.briarproject.bramble.mailbox.sessions; import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.db.DatabaseComponent; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/ContactMailboxSession.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/sessions/ContactMailboxSession.java similarity index 98% rename from bramble-core/src/main/java/org/briarproject/bramble/mailbox/ContactMailboxSession.java rename to bramble-core/src/main/java/org/briarproject/bramble/mailbox/sessions/ContactMailboxSession.java index bf5d916ffd1eba46a461c7f0dcd09f44de81b575..7503f5e7d2415241994eba7e712b2d660565fc99 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/ContactMailboxSession.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/sessions/ContactMailboxSession.java @@ -1,4 +1,4 @@ -package org.briarproject.bramble.mailbox; +package org.briarproject.bramble.mailbox.sessions; import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.db.DatabaseComponent; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/FeedableSyncInputStream.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/sessions/FeedableSyncInputStream.java similarity index 96% rename from bramble-core/src/main/java/org/briarproject/bramble/mailbox/FeedableSyncInputStream.java rename to bramble-core/src/main/java/org/briarproject/bramble/mailbox/sessions/FeedableSyncInputStream.java index f7538c6e05e259c98b0f83558d7c5d09972988c8..e5310130fadc7232abf74a62cfbe66b7eb7779b6 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/FeedableSyncInputStream.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/sessions/FeedableSyncInputStream.java @@ -1,4 +1,4 @@ -package org.briarproject.bramble.mailbox; +package org.briarproject.bramble.mailbox.sessions; import java.io.ByteArrayOutputStream; import java.io.EOFException; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxContactSession.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/sessions/MailboxContactSession.java similarity index 98% rename from bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxContactSession.java rename to bramble-core/src/main/java/org/briarproject/bramble/mailbox/sessions/MailboxContactSession.java index 115f318ee0869b3acac0abce27435acf1da94696..04c9336870266aafcef8d9bba0370641840e4867 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxContactSession.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/sessions/MailboxContactSession.java @@ -1,4 +1,4 @@ -package org.briarproject.bramble.mailbox; +package org.briarproject.bramble.mailbox.sessions; import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.db.DatabaseComponent; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxOwnerSession.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/sessions/MailboxOwnerSession.java similarity index 98% rename from bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxOwnerSession.java rename to bramble-core/src/main/java/org/briarproject/bramble/mailbox/sessions/MailboxOwnerSession.java index 0e313cf3717f0268d30dd09e0c7661926dc036c2..3bb2d2edc0e4ed4644d90b0d3ff65cbb74e4e2d8 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxOwnerSession.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/sessions/MailboxOwnerSession.java @@ -1,4 +1,4 @@ -package org.briarproject.bramble.mailbox; +package org.briarproject.bramble.mailbox.sessions; import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.db.DatabaseComponent; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxSessionFactory.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/sessions/MailboxSessionFactory.java similarity index 90% rename from bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxSessionFactory.java rename to bramble-core/src/main/java/org/briarproject/bramble/mailbox/sessions/MailboxSessionFactory.java index 70331ff9b940f8ea7b08b37b149ccdb793a7d77a..c5e44816483702891e3fe281064b98fb05107887 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxSessionFactory.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/sessions/MailboxSessionFactory.java @@ -1,4 +1,4 @@ -package org.briarproject.bramble.mailbox; +package org.briarproject.bramble.mailbox.sessions; import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.contact.ContactType; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxSessionFactoryImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/sessions/MailboxSessionFactoryImpl.java similarity index 98% rename from bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxSessionFactoryImpl.java rename to bramble-core/src/main/java/org/briarproject/bramble/mailbox/sessions/MailboxSessionFactoryImpl.java index 9dd424c5706d5dcc5196a16e95ff7f5867672ae2..9fa2586173a38c04d198f0a505e7634724e13e23 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxSessionFactoryImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/sessions/MailboxSessionFactoryImpl.java @@ -1,4 +1,4 @@ -package org.briarproject.bramble.mailbox; +package org.briarproject.bramble.mailbox.sessions; import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.contact.ContactType; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxSyncRequestWriter.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/sessions/MailboxSyncRequestWriter.java similarity index 97% rename from bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxSyncRequestWriter.java rename to bramble-core/src/main/java/org/briarproject/bramble/mailbox/sessions/MailboxSyncRequestWriter.java index 5e8c57fda57c8342d7eea8f8992429d99ae83f21..f4cb424f4c2d362853f4643c987eb63a20d63ef6 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxSyncRequestWriter.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/sessions/MailboxSyncRequestWriter.java @@ -1,4 +1,4 @@ -package org.briarproject.bramble.mailbox; +package org.briarproject.bramble.mailbox.sessions; import org.briarproject.bramble.api.transport.StreamWriter; import org.briarproject.bramble.mailbox.protocol.MailboxProtocol; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/PrivateMailboxSession.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/sessions/PrivateMailboxSession.java similarity index 98% rename from bramble-core/src/main/java/org/briarproject/bramble/mailbox/PrivateMailboxSession.java rename to bramble-core/src/main/java/org/briarproject/bramble/mailbox/sessions/PrivateMailboxSession.java index 1d24dd3f3a51440d32c2f697bce8215b8466fa62..a43c6601d29f3740f20f8d6464685298abea3fed 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/PrivateMailboxSession.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/sessions/PrivateMailboxSession.java @@ -1,4 +1,4 @@ -package org.briarproject.bramble.mailbox; +package org.briarproject.bramble.mailbox.sessions; import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.db.DatabaseComponent;