From d07b98eae173ef5b3c44877319932364625105fa Mon Sep 17 00:00:00 2001 From: akwizgran Date: Fri, 14 Jun 2019 11:31:59 +0100 Subject: [PATCH] Code cleanups, javadoc. --- .../briar/android/attachment/AttachmentCreationTask.java | 2 +- .../briar/android/attachment/AttachmentCreator.java | 8 ++++---- .../briar/android/attachment/AttachmentRetriever.java | 1 + .../briar/api/messaging/FileTooBigException.java | 3 +++ 4 files changed, 9 insertions(+), 5 deletions(-) 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 d9e77d1d8..fee272a74 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 @@ -59,7 +59,7 @@ class AttachmentCreationTask { } @IoExecutor - public void storeAttachments() { + void storeAttachments() { for (Uri uri: uris) processUri(uri); AttachmentCreator attachmentCreator = this.attachmentCreator; if (!canceled && attachmentCreator != null) 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 c22d46024..ea7ed11b1 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 @@ -111,14 +111,14 @@ public class AttachmentCreator { } @IoExecutor - void onAttachmentError(Uri uri, Throwable t) { + void onAttachmentError(Uri uri, Exception e) { // get error message String errorMsg; - if (t instanceof UnsupportedMimeTypeException) { - String mimeType = ((UnsupportedMimeTypeException) t).getMimeType(); + if (e instanceof UnsupportedMimeTypeException) { + String mimeType = ((UnsupportedMimeTypeException) e).getMimeType(); errorMsg = app.getString( R.string.image_attach_error_invalid_mime_type, mimeType); - } else if (t instanceof FileTooBigException) { + } else if (e instanceof FileTooBigException) { int mb = MAX_IMAGE_SIZE / 1024 / 1024; errorMsg = app.getString(R.string.image_attach_error_too_big, mb); } else { 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 d3fb1188b..a8da12a2a 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 @@ -47,6 +47,7 @@ public class AttachmentRetriever { private static final Logger LOG = getLogger(AttachmentRetriever.class.getName()); + private static final int READ_LIMIT = 1024 * 8192; private final MessagingManager messagingManager; 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/messaging/FileTooBigException.java index f7d9c7c04..00378475c 100644 --- a/briar-api/src/main/java/org/briarproject/briar/api/messaging/FileTooBigException.java +++ b/briar-api/src/main/java/org/briarproject/briar/api/messaging/FileTooBigException.java @@ -2,5 +2,8 @@ package org.briarproject.briar.api.messaging; import java.io.IOException; +/** + * An exception that is thrown when a file is too big to attach to a message. + */ public class FileTooBigException extends IOException { }