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

Only cache attachment items that include size.

Browse Source
This commit is contained in:
akwizgran
2019-06-18 16:59:12 +01:00
parent f3bbc7179e
commit b6b15fe657
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentCreationTask.java
View File

@@ -119,7 +119,7 @@ class AttachmentCreationTask {
AttachmentItem item = AttachmentItem item =
retriever.getAttachmentItem(header, a, needsSize); retriever.getAttachmentItem(header, a, needsSize);
if (item.hasError()) throw new IOException(); if (item.hasError()) throw new IOException();
retriever.cachePut(item); if (needsSize) retriever.cachePut(item);
return new AttachmentItemResult(uri, item); return new AttachmentItemResult(uri, item);
} catch (DbException | IOException e) { } catch (DbException | IOException e) {
logException(LOG, WARNING, e); logException(LOG, WARNING, e);

5
briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java
View File

@@ -545,6 +545,8 @@ public class ConversationActivity extends BriarActivity
// TODO move getting the items off to IoExecutor, if size == 1 // TODO move getting the items off to IoExecutor, if size == 1
List<AttachmentItem> items = List<AttachmentItem> items =
attachmentRetriever.getAttachmentItems(attachments); attachmentRetriever.getAttachmentItems(attachments);
if (items.size() == 1)
attachmentRetriever.cachePut(items.get(0));
displayMessageAttachments(messageId, items); displayMessageAttachments(messageId, items);
} catch (DbException e) { } catch (DbException e) {
logException(LOG, WARNING, e); logException(LOG, WARNING, e);
@@ -555,9 +557,6 @@ public class ConversationActivity extends BriarActivity
private void displayMessageAttachments(MessageId m, private void displayMessageAttachments(MessageId m,
List<AttachmentItem> items) { List<AttachmentItem> items) {
runOnUiThreadUnlessDestroyed(() -> { runOnUiThreadUnlessDestroyed(() -> {
for (AttachmentItem item : items) {
attachmentRetriever.cachePut(item);
}
Pair<Integer, ConversationMessageItem> pair = Pair<Integer, ConversationMessageItem> pair =
adapter.getMessageItem(m); adapter.getMessageItem(m);
if (pair != null) { if (pair != null) {