From 6b6798d4e1b5ce6a8ea643180dfbf6f05ed6fed7 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Mon, 25 May 2020 15:52:45 +0200
Subject: [PATCH] Download body for synchronized, expanded messages

---
 .../eu/faircode/email/AdapterMessage.java     | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 0f8512b2d1..58e94ee763 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -4837,6 +4837,36 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                 if (!Objects.equals(prev.uid, next.uid)) {
                     same = false;
                     log("uid changed", next.id);
+
+                    // Download body when needed
+                    if (!next.content &&
+                            prev.uid == null && next.uid != null && // once only
+                            properties.getValue("expanded", next.id)) {
+
+                        Bundle args = new Bundle();
+                        args.putLong("id", next.id);
+
+                        new SimpleTask<Void>() {
+                            @Override
+                            protected Void onExecute(Context context, Bundle args) {
+                                long id = args.getLong("id");
+
+                                DB db = DB.getInstance(context);
+                                EntityMessage message = db.message().getMessage(id);
+                                if (message == null || message.content)
+                                    return null;
+
+                                EntityOperation.queue(context, message, EntityOperation.BODY);
+
+                                return null;
+                            }
+
+                            @Override
+                            protected void onException(Bundle args, Throwable ex) {
+                                Log.unexpectedError(parentFragment.getParentFragmentManager(), ex);
+                            }
+                        }.execute(context, owner, args, "message:body");
+                    }
                 }
                 if (!Objects.equals(prev.msgid, next.msgid)) {
                     // debug info