Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-11 18:29:05 +01:00
Code Issues Projects Releases Wiki Activity

Reorganize MediaModule and AttachmentModule

Browse Source
This commit is contained in:
Sebastian Kürten
2021-01-04 18:30:43 +01:00
committed by Torsten Grote
parent 6660625ba6
commit cae53a9fcc
84 changed files with 530 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
briar-api/src/main/java/org/briarproject/briar/api/media/Attachment.java → briar-api/src/main/java/org/briarproject/briar/api/attachment/Attachment.java
View File

@@ -1,4 +1,4 @@
package org.briarproject.briar.api.media;
package org.briarproject.briar.api.attachment;
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;

2
briar-api/src/main/java/org/briarproject/briar/api/media/AttachmentHeader.java → briar-api/src/main/java/org/briarproject/briar/api/attachment/AttachmentHeader.java
View File

@@ -1,4 +1,4 @@
package org.briarproject.briar.api.media;
package org.briarproject.briar.api.attachment;
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
import org.briarproject.bramble.api.sync.MessageId;

2
briar-api/src/main/java/org/briarproject/briar/api/media/AttachmentReader.java → briar-api/src/main/java/org/briarproject/briar/api/attachment/AttachmentReader.java
View File

@@ -1,4 +1,4 @@
package org.briarproject.briar.api.media;
package org.briarproject.briar.api.attachment;
import org.briarproject.bramble.api.db.DbException;

2
briar-api/src/main/java/org/briarproject/briar/api/media/FileTooBigException.java → briar-api/src/main/java/org/briarproject/briar/api/attachment/FileTooBigException.java
View File

@@ -1,4 +1,4 @@
package org.briarproject.briar.api.media;
package org.briarproject.briar.api.attachment;
import java.io.IOException;

2
briar-api/src/main/java/org/briarproject/briar/api/media/InvalidAttachmentException.java → briar-api/src/main/java/org/briarproject/briar/api/attachment/InvalidAttachmentException.java
View File

@@ -1,4 +1,4 @@
package org.briarproject.briar.api.media;
package org.briarproject.briar.api.attachment;
import org.briarproject.bramble.api.db.DbException;
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;

2
briar-api/src/main/java/org/briarproject/briar/api/media/MediaConstants.java → briar-api/src/main/java/org/briarproject/briar/api/attachment/MediaConstants.java
View File

@@ -1,4 +1,4 @@
package org.briarproject.briar.api.media;
package org.briarproject.briar.api.attachment;
import static org.briarproject.bramble.api.sync.SyncConstants.MAX_MESSAGE_BODY_LENGTH;

2
briar-api/src/main/java/org/briarproject/briar/api/avatar/AvatarManager.java
View File

@@ -5,7 +5,7 @@ import org.briarproject.bramble.api.db.DbException;
import org.briarproject.bramble.api.db.Transaction;
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
import org.briarproject.bramble.api.sync.ClientId;
import org.briarproject.briar.api.media.AttachmentHeader;
import org.briarproject.briar.api.attachment.AttachmentHeader;
import java.io.IOException;
import java.io.InputStream;

2
briar-api/src/main/java/org/briarproject/briar/api/avatar/event/AvatarUpdatedEvent.java
View File

@@ -3,7 +3,7 @@ package org.briarproject.briar.api.avatar.event;
import org.briarproject.bramble.api.contact.ContactId;
import org.briarproject.bramble.api.event.Event;
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
import org.briarproject.briar.api.media.AttachmentHeader;
import org.briarproject.briar.api.attachment.AttachmentHeader;
import javax.annotation.concurrent.Immutable;

2
briar-api/src/main/java/org/briarproject/briar/api/identity/AuthorInfo.java
View File

@@ -1,7 +1,7 @@
package org.briarproject.briar.api.identity;
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
import org.briarproject.briar.api.media.AttachmentHeader;
import org.briarproject.briar.api.attachment.AttachmentHeader;
import javax.annotation.Nullable;
import javax.annotation.concurrent.Immutable;

6
briar-api/src/main/java/org/briarproject/briar/api/messaging/MessagingManager.java
View File

@@ -7,9 +7,9 @@ import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
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.attachment.AttachmentHeader;
import org.briarproject.briar.api.attachment.FileTooBigException;
import org.briarproject.briar.api.conversation.ConversationManager.ConversationClient;
import org.briarproject.briar.api.media.AttachmentHeader;
import org.briarproject.briar.api.media.FileTooBigException;
import java.io.IOException;
import java.io.InputStream;
@@ -72,7 +72,7 @@ public interface MessagingManager extends ConversationClient {
/**
* Returns true if the contact with the given {@link ContactId} does support
* image attachments.
*
* <p>
* Added: 2019-01-01
*/
boolean contactSupportsImages(Transaction txn, ContactId c)

2
briar-api/src/main/java/org/briarproject/briar/api/messaging/PrivateMessage.java
View File

@@ -2,7 +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 org.briarproject.briar.api.attachment.AttachmentHeader;
import java.util.List;

2
briar-api/src/main/java/org/briarproject/briar/api/messaging/PrivateMessageFactory.java
View File

@@ -3,7 +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 org.briarproject.briar.api.attachment.AttachmentHeader;
import java.util.List;

2
briar-api/src/main/java/org/briarproject/briar/api/messaging/PrivateMessageHeader.java
View File

@@ -3,9 +3,9 @@ package org.briarproject.briar.api.messaging;
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.attachment.AttachmentHeader;
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;

4
briar-api/src/test/java/org/briarproject/briar/api/identity/AuthorInfoTest.java
View File

@@ -2,14 +2,14 @@ package org.briarproject.briar.api.identity;
import org.briarproject.bramble.api.sync.MessageId;
import org.briarproject.bramble.test.BrambleTestCase;
import org.briarproject.briar.api.media.AttachmentHeader;
import org.briarproject.briar.api.attachment.AttachmentHeader;
import org.junit.Test;
import static org.briarproject.bramble.test.TestUtils.getRandomId;
import static org.briarproject.bramble.util.StringUtils.getRandomString;
import static org.briarproject.briar.api.attachment.MediaConstants.MAX_CONTENT_TYPE_BYTES;
import static org.briarproject.briar.api.identity.AuthorInfo.Status.NONE;
import static org.briarproject.briar.api.identity.AuthorInfo.Status.VERIFIED;
import static org.briarproject.briar.api.media.MediaConstants.MAX_CONTENT_TYPE_BYTES;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;