feat: receive pre-messages and adapt download on demand

deltachat-ffi/deltachat.h

@@ -4283,7 +4283,8 @@ char*             dc_msg_get_webxdc_info      (const dc_msg_t* msg);
 
 /**
  * Get the size of the file. Returns the size of the file associated with a
- * message, if applicable.
+ * message, if applicable. 
+ * If message is a pre-message, then this returns size of the to be downloaded file.
  *
  * Typically, this is used to show the size of document files, e.g. a PDF.
  *

deltachat-jsonrpc/src/api/types/message.rs

@@ -48,6 +48,9 @@ pub struct MessageObject {
     has_location: bool,
     has_html: bool,
     view_type: MessageViewtype,
+    /// If message is a pre-message,
+    /// then this returns the viewtype it will have when it is downloaded.
+    full_message_view_type: Option<MessageViewtype>,
     state: u32,
 
     /// An error text, if there is one.
@@ -92,6 +95,8 @@ pub struct MessageObject {
 
     file: Option<String>,
     file_mime: Option<String>,
+    /// Returns the size of the file in bytes, if applicable.
+    /// If message is a pre-message, then this returns size of the to be downloaded file.
     file_bytes: u64,
     file_name: Option<String>,
 
@@ -210,6 +215,7 @@ impl MessageObject {
             has_location: message.has_location(),
             has_html: message.has_html(),
             view_type: message.get_viewtype().into(),
+            full_message_view_type: message.get_full_message_viewtype().map(Into::into),
             state: message
                 .get_state()
                 .to_u32()
@@ -681,6 +687,9 @@ pub struct MessageInfo {
     rfc724_mid: String,
     server_urls: Vec<String>,
     hop_info: String,
+    /// If message is a pre-message,
+    /// then this returns the viewtype it will have when it is downloaded.
+    full_message_view_type: Option<MessageViewtype>,
 }
 
 impl MessageInfo {
@@ -704,6 +713,7 @@ impl MessageInfo {
             rfc724_mid: message.rfc724_mid().to_owned(),
             server_urls,
             hop_info,
+            full_message_view_type: message.get_full_message_viewtype().map(Into::into),
         })
     }
 }

deltachat-rpc-client/tests/test_something.py

@@ -11,7 +11,7 @@
 import pytest
 
 from deltachat_rpc_client import Contact, EventType, Message, events
-from deltachat_rpc_client.const import DownloadState, MessageState
+from deltachat_rpc_client.const import MessageState
 from deltachat_rpc_client.pytestplugin import E2EE_INFO_MSGS
 from deltachat_rpc_client.rpc import JsonRpcError
 

src/context.rs

@@ -591,7 +591,7 @@ impl Context {
                     convert_folder_meaning(self, folder_meaning).await?
                 {
                     connection
-                        .fetch_move_delete(self, &mut session, &watch_folder, folder_meaning)
+                        .fetch_move_delete(self, &mut session, true, &watch_folder, folder_meaning)
                         .await?;
                 }
             }
@@ -605,6 +605,12 @@ impl Context {
                     warn!(self, "Failed to update quota: {err:#}.");
                 }
             }
+
+            // OPTIONAL TODO: if time left start downloading messages
+            // while (msg = download_when_normal_starts) {
+            //  if not time_left {break;}
+            //  connection.download_message(msg) }
+            // }
         }
 
         info!(