From c955466bdac996e8e9d46920a9cc80769a22f0ae Mon Sep 17 00:00:00 2001 From: akwizgran Date: Wed, 19 Jun 2019 12:04:45 +0100 Subject: [PATCH] Load missing attachments when they arrive. --- .../conversation/ConversationActivity.java | 78 +++++++++++++------ .../conversation/ConversationVisitor.java | 7 +- 2 files changed, 55 insertions(+), 30 deletions(-) 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 71bed46b7..d983479b2 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 @@ -82,6 +82,7 @@ import org.briarproject.briar.api.messaging.Attachment; import org.briarproject.briar.api.messaging.AttachmentHeader; import org.briarproject.briar.api.messaging.MessagingManager; import org.briarproject.briar.api.messaging.PrivateMessageHeader; +import org.briarproject.briar.api.messaging.event.AttachmentReceivedEvent; import org.briarproject.briar.api.privategroup.invitation.GroupInvitationManager; import java.util.ArrayList; @@ -113,6 +114,7 @@ import static java.util.Collections.sort; import static java.util.Objects.requireNonNull; import static java.util.logging.Level.INFO; import static java.util.logging.Level.WARNING; +import static java.util.logging.Logger.getLogger; import static org.briarproject.bramble.util.LogUtils.logDuration; import static org.briarproject.bramble.util.LogUtils.logException; import static org.briarproject.bramble.util.LogUtils.now; @@ -140,7 +142,7 @@ public class ConversationActivity extends BriarActivity public static final String CONTACT_ID = "briar.CONTACT_ID"; private static final Logger LOG = - Logger.getLogger(ConversationActivity.class.getName()); + getLogger(ConversationActivity.class.getName()); private static final int TRANSITION_DURATION_MS = 500; private static final int ONBOARDING_DELAY_MS = 250; @@ -173,6 +175,8 @@ public class ConversationActivity extends BriarActivity volatile GroupInvitationManager groupInvitationManager; private final Map textCache = new ConcurrentHashMap<>(); + private final Map missingAttachments = + new ConcurrentHashMap<>(); private final Observer contactNameObserver = name -> { requireNonNull(name); loadMessages(); @@ -455,15 +459,19 @@ public class ConversationActivity extends BriarActivity List items = attachmentRetriever.cacheGet(id); if (items == null) { LOG.info("Eagerly loading image size for latest message"); - Attachment a = attachmentRetriever - .getMessageAttachment(headers.get(0)); - AttachmentItem item = - attachmentRetriever.getAttachmentItem(a, true); - attachmentRetriever.cachePut(id, singletonList(item)); + AttachmentHeader header = headers.get(0); + try { + Attachment a = attachmentRetriever + .getMessageAttachment(header); + AttachmentItem item = + attachmentRetriever.getAttachmentItem(a, true); + attachmentRetriever.cachePut(id, singletonList(item)); + } catch (NoSuchMessageException e) { + LOG.info("Attachment not received yet"); + missingAttachments.put(header.getMessageId(), h); + } } } - } catch (NoSuchMessageException e) { - LOG.info("Attachment not received yet"); } catch (DbException e) { logException(LOG, WARNING, e); } @@ -543,25 +551,30 @@ public class ConversationActivity extends BriarActivity && adapter.isScrolledToBottom(layoutManager); } - private void loadMessageAttachments(MessageId messageId, - List headers) { + private void loadMessageAttachments(PrivateMessageHeader h) { // TODO: Use placeholders for missing/invalid attachments runOnDbThread(() -> { try { // TODO move getting the items off to IoExecutor, if size == 1 + List headers = h.getAttachmentHeaders(); boolean needsSize = headers.size() == 1; List items = new ArrayList<>(headers.size()); - for (AttachmentHeader h : headers) { - Attachment a = attachmentRetriever.getMessageAttachment(h); - AttachmentItem item = - attachmentRetriever.getAttachmentItem(a, needsSize); - items.add(item); + for (AttachmentHeader header : headers) { + try { + Attachment a = attachmentRetriever + .getMessageAttachment(header); + AttachmentItem item = attachmentRetriever + .getAttachmentItem(a, needsSize); + items.add(item); + } catch (NoSuchMessageException e) { + LOG.info("Attachment not received yet"); + missingAttachments.put(header.getMessageId(), h); + return; + } } - // TODO: Don't cache items unless all are present and valid - attachmentRetriever.cachePut(messageId, items); - displayMessageAttachments(messageId, items); - } catch (NoSuchMessageException e) { - LOG.info("Attachment not received yet"); + // Don't cache items unless all are present and valid + attachmentRetriever.cachePut(h.getId(), items); + displayMessageAttachments(h.getId(), items); } catch (DbException e) { logException(LOG, WARNING, e); } @@ -584,7 +597,13 @@ public class ConversationActivity extends BriarActivity @Override public void eventOccurred(Event e) { - // TODO: Load missing attachments when they arrive + if (e instanceof AttachmentReceivedEvent) { + AttachmentReceivedEvent a = (AttachmentReceivedEvent) e; + if (a.getContactId().equals(contactId)) { + LOG.info("Attachment received"); + onAttachmentReceived(a.getMessageId()); + } + } if (e instanceof ContactRemovedEvent) { ContactRemovedEvent c = (ContactRemovedEvent) e; if (c.getContactId().equals(contactId)) { @@ -635,6 +654,15 @@ public class ConversationActivity extends BriarActivity scrollToBottom(); } + @UiThread + private void onAttachmentReceived(MessageId attachmentId) { + PrivateMessageHeader h = missingAttachments.remove(attachmentId); + if (h != null) { + LOG.info("Missing attachment received"); + loadMessageAttachments(h); + } + } + @UiThread private void onNewConversationMessage(ConversationMessageHeader h) { if (h instanceof ConversationRequest || @@ -921,11 +949,11 @@ public class ConversationActivity extends BriarActivity } @Override - public List getAttachmentItems(MessageId m, - List headers) { - List attachments = attachmentRetriever.cacheGet(m); + public List getAttachmentItems(PrivateMessageHeader h) { + List attachments = + attachmentRetriever.cacheGet(h.getId()); if (attachments == null) { - loadMessageAttachments(m, headers); + loadMessageAttachments(h); return emptyList(); } return attachments; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationVisitor.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationVisitor.java index 48f39e666..c7d8fc9a4 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationVisitor.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationVisitor.java @@ -15,7 +15,6 @@ import org.briarproject.briar.api.forum.ForumInvitationRequest; import org.briarproject.briar.api.forum.ForumInvitationResponse; import org.briarproject.briar.api.introduction.IntroductionRequest; import org.briarproject.briar.api.introduction.IntroductionResponse; -import org.briarproject.briar.api.messaging.AttachmentHeader; import org.briarproject.briar.api.messaging.PrivateMessageHeader; import org.briarproject.briar.api.privategroup.invitation.GroupInvitationRequest; import org.briarproject.briar.api.privategroup.invitation.GroupInvitationResponse; @@ -56,8 +55,7 @@ class ConversationVisitor implements if (h.getAttachmentHeaders().isEmpty()) { attachments = emptyList(); } else { - attachments = attachmentCache - .getAttachmentItems(h.getId(), h.getAttachmentHeaders()); + attachments = attachmentCache.getAttachmentItems(h); } if (h.isLocal()) { item = new ConversationMessageItem( @@ -295,7 +293,6 @@ class ConversationVisitor implements } interface AttachmentCache { - List getAttachmentItems(MessageId m, - List headers); + List getAttachmentItems(PrivateMessageHeader h); } } -- GitLab