From ef9b22670df074b1fcd6a6cde9d582a4e2ce1cd8 Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Thu, 19 Nov 2020 17:42:56 -0300 Subject: [PATCH] Factor our attachment classes and constants because they will be used by more than one client --- .../AttachmentRetrieverIntegrationTest.java | 4 ++-- .../attachment/AttachmentCreationTask.java | 2 +- .../android/attachment/AttachmentCreator.java | 2 +- .../attachment/AttachmentCreatorImpl.java | 6 +++--- .../briar/android/attachment/AttachmentItem.java | 2 +- .../android/attachment/AttachmentManager.java | 2 +- .../android/attachment/AttachmentRetriever.java | 4 ++-- .../attachment/AttachmentRetrieverImpl.java | 4 ++-- .../briar/android/blog/ReblogFragment.java | 2 +- .../android/blog/WriteBlogPostActivity.java | 2 +- .../conversation/ConversationActivity.java | 2 +- .../conversation/ConversationViewModel.java | 2 +- .../android/conversation/ImageViewModel.java | 2 +- .../conversation/glide/BriarDataFetcher.java | 2 +- .../IntroductionMessageFragment.java | 2 +- .../android/sharing/BaseMessageFragment.java | 2 +- .../android/threaded/ThreadListActivity.java | 2 +- .../briar/android/view/TextSendController.java | 2 +- .../attachment/AttachmentRetrieverTest.java | 4 ++-- .../api/{messaging => media}/Attachment.java | 2 +- .../{messaging => media}/AttachmentHeader.java | 2 +- .../FileTooBigException.java | 2 +- .../InvalidAttachmentException.java | 2 +- .../briar/api/messaging/MessagingManager.java | 4 ++++ .../briar/api/messaging/PrivateMessage.java | 1 + .../api/messaging/PrivateMessageFactory.java | 1 + .../api/messaging/PrivateMessageHeader.java | 1 + .../CountingInputStream.java | 8 ++++---- .../briarproject/briar/media/MediaConstants.java | 8 ++++++++ .../briar/messaging/MessagingConstants.java | 2 -- .../briar/messaging/MessagingManagerImpl.java | 16 ++++++++-------- .../messaging/PrivateMessageFactoryImpl.java | 2 +- .../briar/messaging/PrivateMessageValidator.java | 5 +++-- .../CountingInputStreamTest.java | 2 +- .../messaging/MessageSizeIntegrationTest.java | 2 +- .../MessagingManagerIntegrationTest.java | 2 +- .../messaging/PrivateMessageValidatorTest.java | 4 ++-- .../SimplexMessagingIntegrationTest.java | 2 +- 38 files changed, 66 insertions(+), 52 deletions(-) rename briar-api/src/main/java/org/briarproject/briar/api/{messaging => media}/Attachment.java (91%) rename briar-api/src/main/java/org/briarproject/briar/api/{messaging => media}/AttachmentHeader.java (94%) rename briar-api/src/main/java/org/briarproject/briar/api/{messaging => media}/FileTooBigException.java (65%) rename briar-api/src/main/java/org/briarproject/briar/api/{messaging => media}/InvalidAttachmentException.java (90%) rename briar-core/src/main/java/org/briarproject/briar/{messaging => media}/CountingInputStream.java (86%) create mode 100644 briar-core/src/main/java/org/briarproject/briar/media/MediaConstants.java rename briar-core/src/test/java/org/briarproject/briar/{messaging => media}/CountingInputStreamTest.java (99%) diff --git a/briar-android/src/androidTestOfficial/java/org/briarproject/briar/android/attachment/AttachmentRetrieverIntegrationTest.java b/briar-android/src/androidTestOfficial/java/org/briarproject/briar/android/attachment/AttachmentRetrieverIntegrationTest.java index 866aecec4..ad296476f 100644 --- a/briar-android/src/androidTestOfficial/java/org/briarproject/briar/android/attachment/AttachmentRetrieverIntegrationTest.java +++ b/briar-android/src/androidTestOfficial/java/org/briarproject/briar/android/attachment/AttachmentRetrieverIntegrationTest.java @@ -2,8 +2,8 @@ package org.briarproject.briar.android.attachment; import org.briarproject.bramble.api.UniqueId; import org.briarproject.bramble.api.sync.MessageId; -import org.briarproject.briar.api.messaging.Attachment; -import org.briarproject.briar.api.messaging.AttachmentHeader; +import org.briarproject.briar.api.media.Attachment; +import org.briarproject.briar.api.media.AttachmentHeader; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentCreationTask.java b/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentCreationTask.java index 10a793b86..58e2fb1ea 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentCreationTask.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentCreationTask.java @@ -9,7 +9,7 @@ import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.lifecycle.IoExecutor; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.GroupId; -import org.briarproject.briar.api.messaging.AttachmentHeader; +import org.briarproject.briar.api.media.AttachmentHeader; import org.briarproject.briar.api.messaging.MessagingManager; import org.jsoup.UnsupportedMimeTypeException; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentCreator.java b/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentCreator.java index c8d9d617e..588c80f30 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentCreator.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentCreator.java @@ -6,7 +6,7 @@ import org.briarproject.bramble.api.lifecycle.IoExecutor; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.GroupId; import org.briarproject.bramble.api.sync.MessageId; -import org.briarproject.briar.api.messaging.AttachmentHeader; +import org.briarproject.briar.api.media.AttachmentHeader; import java.util.Collection; import java.util.List; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentCreatorImpl.java b/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentCreatorImpl.java index 4eb79a02f..650801c77 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentCreatorImpl.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentCreatorImpl.java @@ -10,9 +10,9 @@ import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.GroupId; import org.briarproject.bramble.api.sync.MessageId; import org.briarproject.briar.R; -import org.briarproject.briar.api.messaging.Attachment; -import org.briarproject.briar.api.messaging.AttachmentHeader; -import org.briarproject.briar.api.messaging.FileTooBigException; +import org.briarproject.briar.api.media.Attachment; +import org.briarproject.briar.api.media.AttachmentHeader; +import org.briarproject.briar.api.media.FileTooBigException; import org.briarproject.briar.api.messaging.MessagingManager; import org.jsoup.UnsupportedMimeTypeException; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentItem.java b/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentItem.java index 9ce231c7d..f24f507f4 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentItem.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentItem.java @@ -5,7 +5,7 @@ import android.os.Parcelable; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.MessageId; -import org.briarproject.briar.api.messaging.AttachmentHeader; +import org.briarproject.briar.api.media.AttachmentHeader; import javax.annotation.concurrent.Immutable; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentManager.java b/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentManager.java index db7f0e850..3c824a161 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentManager.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentManager.java @@ -3,7 +3,7 @@ package org.briarproject.briar.android.attachment; import android.net.Uri; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; -import org.briarproject.briar.api.messaging.AttachmentHeader; +import org.briarproject.briar.api.media.AttachmentHeader; import java.util.Collection; import java.util.List; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentRetriever.java b/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentRetriever.java index 2bf6b69ea..68b8a5b37 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentRetriever.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentRetriever.java @@ -4,8 +4,8 @@ import org.briarproject.bramble.api.db.DatabaseExecutor; import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.MessageId; -import org.briarproject.briar.api.messaging.Attachment; -import org.briarproject.briar.api.messaging.AttachmentHeader; +import org.briarproject.briar.api.media.Attachment; +import org.briarproject.briar.api.media.AttachmentHeader; import org.briarproject.briar.api.messaging.PrivateMessageHeader; import org.briarproject.briar.api.messaging.event.AttachmentReceivedEvent; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentRetrieverImpl.java b/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentRetrieverImpl.java index 1faa7dd1e..8ac9666f6 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentRetrieverImpl.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentRetrieverImpl.java @@ -6,8 +6,8 @@ import org.briarproject.bramble.api.db.NoSuchMessageException; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.MessageId; import org.briarproject.briar.android.attachment.AttachmentItem.State; -import org.briarproject.briar.api.messaging.Attachment; -import org.briarproject.briar.api.messaging.AttachmentHeader; +import org.briarproject.briar.api.media.Attachment; +import org.briarproject.briar.api.media.AttachmentHeader; import org.briarproject.briar.api.messaging.MessagingManager; import org.briarproject.briar.api.messaging.PrivateMessageHeader; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/blog/ReblogFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/blog/ReblogFragment.java index 3f6f881ad..98cb51794 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/blog/ReblogFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/blog/ReblogFragment.java @@ -20,7 +20,7 @@ import org.briarproject.briar.android.fragment.BaseFragment; import org.briarproject.briar.android.view.TextInputView; import org.briarproject.briar.android.view.TextSendController; import org.briarproject.briar.android.view.TextSendController.SendListener; -import org.briarproject.briar.api.messaging.AttachmentHeader; +import org.briarproject.briar.api.media.AttachmentHeader; import java.util.List; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/blog/WriteBlogPostActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/blog/WriteBlogPostActivity.java index 6ac261ecf..eaf047fe9 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/blog/WriteBlogPostActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/blog/WriteBlogPostActivity.java @@ -22,7 +22,7 @@ import org.briarproject.briar.api.android.AndroidNotificationManager; import org.briarproject.briar.api.blog.BlogManager; import org.briarproject.briar.api.blog.BlogPost; import org.briarproject.briar.api.blog.BlogPostFactory; -import org.briarproject.briar.api.messaging.AttachmentHeader; +import org.briarproject.briar.api.media.AttachmentHeader; import java.security.GeneralSecurityException; import java.util.List; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java index 9f85d0d8f..481aa7683 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java @@ -71,7 +71,7 @@ import org.briarproject.briar.api.conversation.DeletionResult; import org.briarproject.briar.api.conversation.event.ConversationMessageReceivedEvent; import org.briarproject.briar.api.forum.ForumSharingManager; import org.briarproject.briar.api.introduction.IntroductionManager; -import org.briarproject.briar.api.messaging.AttachmentHeader; +import org.briarproject.briar.api.media.AttachmentHeader; import org.briarproject.briar.api.messaging.MessagingManager; import org.briarproject.briar.api.messaging.PrivateMessageHeader; import org.briarproject.briar.api.privategroup.invitation.GroupInvitationManager; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationViewModel.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationViewModel.java index 7ff5d50e4..abcc55a40 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationViewModel.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationViewModel.java @@ -31,7 +31,7 @@ import org.briarproject.briar.android.util.UiUtils; import org.briarproject.briar.android.viewmodel.DbViewModel; import org.briarproject.briar.android.viewmodel.LiveEvent; import org.briarproject.briar.android.viewmodel.MutableLiveEvent; -import org.briarproject.briar.api.messaging.AttachmentHeader; +import org.briarproject.briar.api.media.AttachmentHeader; import org.briarproject.briar.api.messaging.MessagingManager; import org.briarproject.briar.api.messaging.PrivateMessage; import org.briarproject.briar.api.messaging.PrivateMessageFactory; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageViewModel.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageViewModel.java index eeba81f3b..3f3feba1a 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageViewModel.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageViewModel.java @@ -20,7 +20,7 @@ import org.briarproject.briar.android.attachment.AttachmentItem; import org.briarproject.briar.android.viewmodel.DbViewModel; import org.briarproject.briar.android.viewmodel.LiveEvent; import org.briarproject.briar.android.viewmodel.MutableLiveEvent; -import org.briarproject.briar.api.messaging.Attachment; +import org.briarproject.briar.api.media.Attachment; import org.briarproject.briar.api.messaging.MessagingManager; import org.briarproject.briar.api.messaging.event.AttachmentReceivedEvent; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/glide/BriarDataFetcher.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/glide/BriarDataFetcher.java index d208ab475..dff40633e 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/glide/BriarDataFetcher.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/glide/BriarDataFetcher.java @@ -8,7 +8,7 @@ import org.briarproject.bramble.api.db.DatabaseExecutor; import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.android.attachment.AttachmentItem; -import org.briarproject.briar.api.messaging.Attachment; +import org.briarproject.briar.api.media.Attachment; import org.briarproject.briar.api.messaging.MessagingManager; import java.io.InputStream; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/introduction/IntroductionMessageFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/introduction/IntroductionMessageFragment.java index e7d85dc91..6321dde14 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/introduction/IntroductionMessageFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/introduction/IntroductionMessageFragment.java @@ -23,7 +23,7 @@ import org.briarproject.briar.android.view.TextInputView; import org.briarproject.briar.android.view.TextSendController; import org.briarproject.briar.android.view.TextSendController.SendListener; import org.briarproject.briar.api.introduction.IntroductionManager; -import org.briarproject.briar.api.messaging.AttachmentHeader; +import org.briarproject.briar.api.media.AttachmentHeader; import java.util.List; import java.util.logging.Logger; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/sharing/BaseMessageFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/sharing/BaseMessageFragment.java index 1d33fd83e..f6592f778 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/sharing/BaseMessageFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/sharing/BaseMessageFragment.java @@ -15,7 +15,7 @@ import org.briarproject.briar.android.fragment.BaseFragment; import org.briarproject.briar.android.view.LargeTextInputView; import org.briarproject.briar.android.view.TextSendController; import org.briarproject.briar.android.view.TextSendController.SendListener; -import org.briarproject.briar.api.messaging.AttachmentHeader; +import org.briarproject.briar.api.media.AttachmentHeader; import java.util.List; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListActivity.java index 22138f19e..487d39a48 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListActivity.java @@ -28,7 +28,7 @@ import org.briarproject.briar.android.view.TextSendController; import org.briarproject.briar.android.view.TextSendController.SendListener; import org.briarproject.briar.android.view.UnreadMessageButton; import org.briarproject.briar.api.client.NamedGroup; -import org.briarproject.briar.api.messaging.AttachmentHeader; +import org.briarproject.briar.api.media.AttachmentHeader; import java.util.Collection; import java.util.List; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/TextSendController.java b/briar-android/src/main/java/org/briarproject/briar/android/view/TextSendController.java index ae2ac2313..573c342ec 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/view/TextSendController.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/view/TextSendController.java @@ -8,7 +8,7 @@ import com.google.android.material.snackbar.Snackbar; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.view.EmojiTextInputView.TextInputListener; -import org.briarproject.briar.api.messaging.AttachmentHeader; +import org.briarproject.briar.api.media.AttachmentHeader; import java.util.List; diff --git a/briar-android/src/test/java/org/briarproject/briar/android/attachment/AttachmentRetrieverTest.java b/briar-android/src/test/java/org/briarproject/briar/android/attachment/AttachmentRetrieverTest.java index 5504da00b..7894acc67 100644 --- a/briar-android/src/test/java/org/briarproject/briar/android/attachment/AttachmentRetrieverTest.java +++ b/briar-android/src/test/java/org/briarproject/briar/android/attachment/AttachmentRetrieverTest.java @@ -3,8 +3,8 @@ package org.briarproject.briar.android.attachment; import org.briarproject.bramble.api.sync.MessageId; import org.briarproject.bramble.test.BrambleMockTestCase; import org.briarproject.bramble.test.ImmediateExecutor; -import org.briarproject.briar.api.messaging.Attachment; -import org.briarproject.briar.api.messaging.AttachmentHeader; +import org.briarproject.briar.api.media.Attachment; +import org.briarproject.briar.api.media.AttachmentHeader; import org.briarproject.briar.api.messaging.MessagingManager; import org.jmock.Expectations; import org.jmock.lib.legacy.ClassImposteriser; diff --git a/briar-api/src/main/java/org/briarproject/briar/api/messaging/Attachment.java b/briar-api/src/main/java/org/briarproject/briar/api/media/Attachment.java similarity index 91% rename from briar-api/src/main/java/org/briarproject/briar/api/messaging/Attachment.java rename to briar-api/src/main/java/org/briarproject/briar/api/media/Attachment.java index 61bb0b0eb..9fb533c77 100644 --- a/briar-api/src/main/java/org/briarproject/briar/api/messaging/Attachment.java +++ b/briar-api/src/main/java/org/briarproject/briar/api/media/Attachment.java @@ -1,4 +1,4 @@ -package org.briarproject.briar.api.messaging; +package org.briarproject.briar.api.media; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; diff --git a/briar-api/src/main/java/org/briarproject/briar/api/messaging/AttachmentHeader.java b/briar-api/src/main/java/org/briarproject/briar/api/media/AttachmentHeader.java similarity index 94% rename from briar-api/src/main/java/org/briarproject/briar/api/messaging/AttachmentHeader.java rename to briar-api/src/main/java/org/briarproject/briar/api/media/AttachmentHeader.java index 970401211..1cd99895a 100644 --- a/briar-api/src/main/java/org/briarproject/briar/api/messaging/AttachmentHeader.java +++ b/briar-api/src/main/java/org/briarproject/briar/api/media/AttachmentHeader.java @@ -1,4 +1,4 @@ -package org.briarproject.briar.api.messaging; +package org.briarproject.briar.api.media; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.MessageId; diff --git a/briar-api/src/main/java/org/briarproject/briar/api/messaging/FileTooBigException.java b/briar-api/src/main/java/org/briarproject/briar/api/media/FileTooBigException.java similarity index 65% rename from briar-api/src/main/java/org/briarproject/briar/api/messaging/FileTooBigException.java rename to briar-api/src/main/java/org/briarproject/briar/api/media/FileTooBigException.java index f7d9c7c04..b41c1d8b8 100644 --- a/briar-api/src/main/java/org/briarproject/briar/api/messaging/FileTooBigException.java +++ b/briar-api/src/main/java/org/briarproject/briar/api/media/FileTooBigException.java @@ -1,4 +1,4 @@ -package org.briarproject.briar.api.messaging; +package org.briarproject.briar.api.media; import java.io.IOException; diff --git a/briar-api/src/main/java/org/briarproject/briar/api/messaging/InvalidAttachmentException.java b/briar-api/src/main/java/org/briarproject/briar/api/media/InvalidAttachmentException.java similarity index 90% rename from briar-api/src/main/java/org/briarproject/briar/api/messaging/InvalidAttachmentException.java rename to briar-api/src/main/java/org/briarproject/briar/api/media/InvalidAttachmentException.java index df32602d1..8c8dea650 100644 --- a/briar-api/src/main/java/org/briarproject/briar/api/messaging/InvalidAttachmentException.java +++ b/briar-api/src/main/java/org/briarproject/briar/api/media/InvalidAttachmentException.java @@ -1,4 +1,4 @@ -package org.briarproject.briar.api.messaging; +package org.briarproject.briar.api.media; import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; diff --git a/briar-api/src/main/java/org/briarproject/briar/api/messaging/MessagingManager.java b/briar-api/src/main/java/org/briarproject/briar/api/messaging/MessagingManager.java index ccb8f776f..1e255874d 100644 --- a/briar-api/src/main/java/org/briarproject/briar/api/messaging/MessagingManager.java +++ b/briar-api/src/main/java/org/briarproject/briar/api/messaging/MessagingManager.java @@ -8,6 +8,10 @@ import org.briarproject.bramble.api.sync.ClientId; import org.briarproject.bramble.api.sync.GroupId; import org.briarproject.bramble.api.sync.MessageId; import org.briarproject.briar.api.conversation.ConversationManager.ConversationClient; +import org.briarproject.briar.api.media.Attachment; +import org.briarproject.briar.api.media.AttachmentHeader; +import org.briarproject.briar.api.media.FileTooBigException; +import org.briarproject.briar.api.media.InvalidAttachmentException; import java.io.IOException; import java.io.InputStream; diff --git a/briar-api/src/main/java/org/briarproject/briar/api/messaging/PrivateMessage.java b/briar-api/src/main/java/org/briarproject/briar/api/messaging/PrivateMessage.java index 58bde1576..586180a93 100644 --- a/briar-api/src/main/java/org/briarproject/briar/api/messaging/PrivateMessage.java +++ b/briar-api/src/main/java/org/briarproject/briar/api/messaging/PrivateMessage.java @@ -2,6 +2,7 @@ package org.briarproject.briar.api.messaging; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.Message; +import org.briarproject.briar.api.media.AttachmentHeader; import java.util.List; diff --git a/briar-api/src/main/java/org/briarproject/briar/api/messaging/PrivateMessageFactory.java b/briar-api/src/main/java/org/briarproject/briar/api/messaging/PrivateMessageFactory.java index 2f7e1127b..7adb75fbe 100644 --- a/briar-api/src/main/java/org/briarproject/briar/api/messaging/PrivateMessageFactory.java +++ b/briar-api/src/main/java/org/briarproject/briar/api/messaging/PrivateMessageFactory.java @@ -3,6 +3,7 @@ package org.briarproject.briar.api.messaging; import org.briarproject.bramble.api.FormatException; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.GroupId; +import org.briarproject.briar.api.media.AttachmentHeader; import java.util.List; diff --git a/briar-api/src/main/java/org/briarproject/briar/api/messaging/PrivateMessageHeader.java b/briar-api/src/main/java/org/briarproject/briar/api/messaging/PrivateMessageHeader.java index 010466f6f..a4673c535 100644 --- a/briar-api/src/main/java/org/briarproject/briar/api/messaging/PrivateMessageHeader.java +++ b/briar-api/src/main/java/org/briarproject/briar/api/messaging/PrivateMessageHeader.java @@ -5,6 +5,7 @@ import org.briarproject.bramble.api.sync.GroupId; import org.briarproject.bramble.api.sync.MessageId; import org.briarproject.briar.api.conversation.ConversationMessageHeader; import org.briarproject.briar.api.conversation.ConversationMessageVisitor; +import org.briarproject.briar.api.media.AttachmentHeader; import java.util.List; diff --git a/briar-core/src/main/java/org/briarproject/briar/messaging/CountingInputStream.java b/briar-core/src/main/java/org/briarproject/briar/media/CountingInputStream.java similarity index 86% rename from briar-core/src/main/java/org/briarproject/briar/messaging/CountingInputStream.java rename to briar-core/src/main/java/org/briarproject/briar/media/CountingInputStream.java index 4f6063565..b3339fa13 100644 --- a/briar-core/src/main/java/org/briarproject/briar/messaging/CountingInputStream.java +++ b/briar-core/src/main/java/org/briarproject/briar/media/CountingInputStream.java @@ -1,4 +1,4 @@ -package org.briarproject.briar.messaging; +package org.briarproject.briar.media; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; @@ -13,19 +13,19 @@ import javax.annotation.concurrent.NotThreadSafe; */ @NotThreadSafe @NotNullByDefault -class CountingInputStream extends InputStream { +public class CountingInputStream extends InputStream { private final InputStream delegate; private final long maxBytesToRead; private long bytesRead = 0; - CountingInputStream(InputStream delegate, long maxBytesToRead) { + public CountingInputStream(InputStream delegate, long maxBytesToRead) { this.delegate = delegate; this.maxBytesToRead = maxBytesToRead; } - long getBytesRead() { + public long getBytesRead() { return bytesRead; } diff --git a/briar-core/src/main/java/org/briarproject/briar/media/MediaConstants.java b/briar-core/src/main/java/org/briarproject/briar/media/MediaConstants.java new file mode 100644 index 000000000..4ac03bab0 --- /dev/null +++ b/briar-core/src/main/java/org/briarproject/briar/media/MediaConstants.java @@ -0,0 +1,8 @@ +package org.briarproject.briar.media; + +public interface MediaConstants { + + // Metadata keys for messages + String MSG_KEY_CONTENT_TYPE = "contentType"; + String MSG_KEY_DESCRIPTOR_LENGTH = "descriptorLength"; +} diff --git a/briar-core/src/main/java/org/briarproject/briar/messaging/MessagingConstants.java b/briar-core/src/main/java/org/briarproject/briar/messaging/MessagingConstants.java index c9cb6b1eb..a280ba46a 100644 --- a/briar-core/src/main/java/org/briarproject/briar/messaging/MessagingConstants.java +++ b/briar-core/src/main/java/org/briarproject/briar/messaging/MessagingConstants.java @@ -9,8 +9,6 @@ interface MessagingConstants { String MSG_KEY_TIMESTAMP = "timestamp"; String MSG_KEY_LOCAL = "local"; String MSG_KEY_MSG_TYPE = "messageType"; - String MSG_KEY_CONTENT_TYPE = "contentType"; - String MSG_KEY_DESCRIPTOR_LENGTH = "descriptorLength"; String MSG_KEY_HAS_TEXT = "hasText"; String MSG_KEY_ATTACHMENT_HEADERS = "attachmentHeaders"; } diff --git a/briar-core/src/main/java/org/briarproject/briar/messaging/MessagingManagerImpl.java b/briar-core/src/main/java/org/briarproject/briar/messaging/MessagingManagerImpl.java index c048e0034..1336dba7b 100644 --- a/briar-core/src/main/java/org/briarproject/briar/messaging/MessagingManagerImpl.java +++ b/briar-core/src/main/java/org/briarproject/briar/messaging/MessagingManagerImpl.java @@ -32,10 +32,10 @@ import org.briarproject.briar.api.client.MessageTracker.GroupCount; import org.briarproject.briar.api.conversation.ConversationManager.ConversationClient; import org.briarproject.briar.api.conversation.ConversationMessageHeader; import org.briarproject.briar.api.conversation.DeletionResult; -import org.briarproject.briar.api.messaging.Attachment; -import org.briarproject.briar.api.messaging.AttachmentHeader; -import org.briarproject.briar.api.messaging.FileTooBigException; -import org.briarproject.briar.api.messaging.InvalidAttachmentException; +import org.briarproject.briar.api.media.Attachment; +import org.briarproject.briar.api.media.AttachmentHeader; +import org.briarproject.briar.api.media.FileTooBigException; +import org.briarproject.briar.api.media.InvalidAttachmentException; import org.briarproject.briar.api.messaging.MessagingManager; import org.briarproject.briar.api.messaging.PrivateMessage; import org.briarproject.briar.api.messaging.PrivateMessageHeader; @@ -61,12 +61,12 @@ import static org.briarproject.bramble.api.sync.SyncConstants.MAX_MESSAGE_BODY_L import static org.briarproject.bramble.api.sync.validation.MessageState.DELIVERED; import static org.briarproject.bramble.util.IoUtils.copyAndClose; import static org.briarproject.briar.client.MessageTrackerConstants.MSG_KEY_READ; +import static org.briarproject.briar.media.MediaConstants.MSG_KEY_CONTENT_TYPE; +import static org.briarproject.briar.media.MediaConstants.MSG_KEY_DESCRIPTOR_LENGTH; import static org.briarproject.briar.messaging.MessageTypes.ATTACHMENT; import static org.briarproject.briar.messaging.MessageTypes.PRIVATE_MESSAGE; import static org.briarproject.briar.messaging.MessagingConstants.GROUP_KEY_CONTACT_ID; import static org.briarproject.briar.messaging.MessagingConstants.MSG_KEY_ATTACHMENT_HEADERS; -import static org.briarproject.briar.messaging.MessagingConstants.MSG_KEY_CONTENT_TYPE; -import static org.briarproject.briar.messaging.MessagingConstants.MSG_KEY_DESCRIPTOR_LENGTH; import static org.briarproject.briar.messaging.MessagingConstants.MSG_KEY_HAS_TEXT; import static org.briarproject.briar.messaging.MessagingConstants.MSG_KEY_LOCAL; import static org.briarproject.briar.messaging.MessagingConstants.MSG_KEY_MSG_TYPE; @@ -297,7 +297,7 @@ class MessagingManagerImpl implements MessagingManager, IncomingMessageHook, try { BdfDictionary meta = clientHelper.getGroupMetadataAsDictionary(txn, g); - return new ContactId(meta.getLong("contactId").intValue()); + return new ContactId(meta.getLong(GROUP_KEY_CONTACT_ID).intValue()); } catch (FormatException e) { throw new DbException(e); } @@ -307,7 +307,7 @@ class MessagingManagerImpl implements MessagingManager, IncomingMessageHook, public ContactId getContactId(GroupId g) throws DbException { try { BdfDictionary meta = clientHelper.getGroupMetadataAsDictionary(g); - return new ContactId(meta.getLong("contactId").intValue()); + return new ContactId(meta.getLong(GROUP_KEY_CONTACT_ID).intValue()); } catch (FormatException e) { throw new DbException(e); } diff --git a/briar-core/src/main/java/org/briarproject/briar/messaging/PrivateMessageFactoryImpl.java b/briar-core/src/main/java/org/briarproject/briar/messaging/PrivateMessageFactoryImpl.java index 467540a3c..6a4927077 100644 --- a/briar-core/src/main/java/org/briarproject/briar/messaging/PrivateMessageFactoryImpl.java +++ b/briar-core/src/main/java/org/briarproject/briar/messaging/PrivateMessageFactoryImpl.java @@ -6,7 +6,7 @@ import org.briarproject.bramble.api.data.BdfList; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.GroupId; import org.briarproject.bramble.api.sync.Message; -import org.briarproject.briar.api.messaging.AttachmentHeader; +import org.briarproject.briar.api.media.AttachmentHeader; import org.briarproject.briar.api.messaging.PrivateMessage; import org.briarproject.briar.api.messaging.PrivateMessageFactory; diff --git a/briar-core/src/main/java/org/briarproject/briar/messaging/PrivateMessageValidator.java b/briar-core/src/main/java/org/briarproject/briar/messaging/PrivateMessageValidator.java index 0b4909bf8..a1387d9f0 100644 --- a/briar-core/src/main/java/org/briarproject/briar/messaging/PrivateMessageValidator.java +++ b/briar-core/src/main/java/org/briarproject/briar/messaging/PrivateMessageValidator.java @@ -16,6 +16,7 @@ import org.briarproject.bramble.api.sync.Message; import org.briarproject.bramble.api.sync.MessageContext; import org.briarproject.bramble.api.sync.validation.MessageValidator; import org.briarproject.bramble.api.system.Clock; +import org.briarproject.briar.media.CountingInputStream; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -31,11 +32,11 @@ import static org.briarproject.briar.api.messaging.MessagingConstants.MAX_ATTACH import static org.briarproject.briar.api.messaging.MessagingConstants.MAX_CONTENT_TYPE_BYTES; import static org.briarproject.briar.api.messaging.MessagingConstants.MAX_PRIVATE_MESSAGE_TEXT_LENGTH; import static org.briarproject.briar.client.MessageTrackerConstants.MSG_KEY_READ; +import static org.briarproject.briar.media.MediaConstants.MSG_KEY_CONTENT_TYPE; +import static org.briarproject.briar.media.MediaConstants.MSG_KEY_DESCRIPTOR_LENGTH; import static org.briarproject.briar.messaging.MessageTypes.ATTACHMENT; import static org.briarproject.briar.messaging.MessageTypes.PRIVATE_MESSAGE; import static org.briarproject.briar.messaging.MessagingConstants.MSG_KEY_ATTACHMENT_HEADERS; -import static org.briarproject.briar.messaging.MessagingConstants.MSG_KEY_CONTENT_TYPE; -import static org.briarproject.briar.messaging.MessagingConstants.MSG_KEY_DESCRIPTOR_LENGTH; import static org.briarproject.briar.messaging.MessagingConstants.MSG_KEY_HAS_TEXT; import static org.briarproject.briar.messaging.MessagingConstants.MSG_KEY_LOCAL; import static org.briarproject.briar.messaging.MessagingConstants.MSG_KEY_MSG_TYPE; diff --git a/briar-core/src/test/java/org/briarproject/briar/messaging/CountingInputStreamTest.java b/briar-core/src/test/java/org/briarproject/briar/media/CountingInputStreamTest.java similarity index 99% rename from briar-core/src/test/java/org/briarproject/briar/messaging/CountingInputStreamTest.java rename to briar-core/src/test/java/org/briarproject/briar/media/CountingInputStreamTest.java index 7c7d2b294..0d11a8408 100644 --- a/briar-core/src/test/java/org/briarproject/briar/messaging/CountingInputStreamTest.java +++ b/briar-core/src/test/java/org/briarproject/briar/media/CountingInputStreamTest.java @@ -1,4 +1,4 @@ -package org.briarproject.briar.messaging; +package org.briarproject.briar.media; import org.briarproject.bramble.test.BrambleTestCase; import org.junit.Test; diff --git a/briar-core/src/test/java/org/briarproject/briar/messaging/MessageSizeIntegrationTest.java b/briar-core/src/test/java/org/briarproject/briar/messaging/MessageSizeIntegrationTest.java index d07067887..7ad320e86 100644 --- a/briar-core/src/test/java/org/briarproject/briar/messaging/MessageSizeIntegrationTest.java +++ b/briar-core/src/test/java/org/briarproject/briar/messaging/MessageSizeIntegrationTest.java @@ -8,7 +8,7 @@ import org.briarproject.bramble.api.sync.GroupId; import org.briarproject.bramble.api.sync.MessageId; import org.briarproject.briar.api.forum.ForumPost; import org.briarproject.briar.api.forum.ForumPostFactory; -import org.briarproject.briar.api.messaging.AttachmentHeader; +import org.briarproject.briar.api.media.AttachmentHeader; import org.briarproject.briar.api.messaging.PrivateMessage; import org.briarproject.briar.api.messaging.PrivateMessageFactory; import org.briarproject.briar.test.BriarTestCase; diff --git a/briar-core/src/test/java/org/briarproject/briar/messaging/MessagingManagerIntegrationTest.java b/briar-core/src/test/java/org/briarproject/briar/messaging/MessagingManagerIntegrationTest.java index 352154e7b..6c214f032 100644 --- a/briar-core/src/test/java/org/briarproject/briar/messaging/MessagingManagerIntegrationTest.java +++ b/briar-core/src/test/java/org/briarproject/briar/messaging/MessagingManagerIntegrationTest.java @@ -8,7 +8,7 @@ import org.briarproject.bramble.api.sync.MessageId; import org.briarproject.bramble.test.TestDatabaseConfigModule; import org.briarproject.briar.api.conversation.ConversationMessageHeader; import org.briarproject.briar.api.conversation.DeletionResult; -import org.briarproject.briar.api.messaging.AttachmentHeader; +import org.briarproject.briar.api.media.AttachmentHeader; import org.briarproject.briar.api.messaging.MessagingManager; import org.briarproject.briar.api.messaging.PrivateMessage; import org.briarproject.briar.api.messaging.PrivateMessageFactory; diff --git a/briar-core/src/test/java/org/briarproject/briar/messaging/PrivateMessageValidatorTest.java b/briar-core/src/test/java/org/briarproject/briar/messaging/PrivateMessageValidatorTest.java index 1f0503f2b..24c95240a 100644 --- a/briar-core/src/test/java/org/briarproject/briar/messaging/PrivateMessageValidatorTest.java +++ b/briar-core/src/test/java/org/briarproject/briar/messaging/PrivateMessageValidatorTest.java @@ -31,11 +31,11 @@ import static org.briarproject.briar.api.messaging.MessagingConstants.MAX_ATTACH import static org.briarproject.briar.api.messaging.MessagingConstants.MAX_CONTENT_TYPE_BYTES; import static org.briarproject.briar.api.messaging.MessagingConstants.MAX_PRIVATE_MESSAGE_TEXT_LENGTH; import static org.briarproject.briar.client.MessageTrackerConstants.MSG_KEY_READ; +import static org.briarproject.briar.media.MediaConstants.MSG_KEY_CONTENT_TYPE; +import static org.briarproject.briar.media.MediaConstants.MSG_KEY_DESCRIPTOR_LENGTH; import static org.briarproject.briar.messaging.MessageTypes.ATTACHMENT; import static org.briarproject.briar.messaging.MessageTypes.PRIVATE_MESSAGE; import static org.briarproject.briar.messaging.MessagingConstants.MSG_KEY_ATTACHMENT_HEADERS; -import static org.briarproject.briar.messaging.MessagingConstants.MSG_KEY_CONTENT_TYPE; -import static org.briarproject.briar.messaging.MessagingConstants.MSG_KEY_DESCRIPTOR_LENGTH; import static org.briarproject.briar.messaging.MessagingConstants.MSG_KEY_HAS_TEXT; import static org.briarproject.briar.messaging.MessagingConstants.MSG_KEY_LOCAL; import static org.briarproject.briar.messaging.MessagingConstants.MSG_KEY_MSG_TYPE; diff --git a/briar-core/src/test/java/org/briarproject/briar/messaging/SimplexMessagingIntegrationTest.java b/briar-core/src/test/java/org/briarproject/briar/messaging/SimplexMessagingIntegrationTest.java index 3671c01e1..feff2346d 100644 --- a/briar-core/src/test/java/org/briarproject/briar/messaging/SimplexMessagingIntegrationTest.java +++ b/briar-core/src/test/java/org/briarproject/briar/messaging/SimplexMessagingIntegrationTest.java @@ -15,7 +15,7 @@ import org.briarproject.bramble.api.sync.event.MessageStateChangedEvent; import org.briarproject.bramble.test.TestDatabaseConfigModule; import org.briarproject.bramble.test.TestTransportConnectionReader; import org.briarproject.bramble.test.TestTransportConnectionWriter; -import org.briarproject.briar.api.messaging.AttachmentHeader; +import org.briarproject.briar.api.media.AttachmentHeader; import org.briarproject.briar.api.messaging.MessagingManager; import org.briarproject.briar.api.messaging.PrivateMessage; import org.briarproject.briar.api.messaging.PrivateMessageFactory;