Reviews

Author: Hocuri

deltachat-jsonrpc/src/api.rs

@@ -594,9 +594,9 @@ impl CommandApi {
     /// Unpublished transports are not advertised to contacts,
     /// and self-sent messages are not sent there,
     /// so that we don't cause extra messages to the corresponding inbox,
-    /// but can still receive messages from contacts who don't know the new relay addresses yet.
+    /// but can still receive messages from contacts who don't know our new transport addresses yet.
     ///
-    /// The default is true, but when updating,
+    /// The default is false, but when the user updates from a version that didn't have this flag,
     /// existing secondary transports are set to unpublished,
     /// so that an existing transport address doesn't suddenly get spammed with a lot of messages.
     async fn set_transport_unpublished(

src/config.rs

@@ -1003,8 +1003,9 @@ impl Context {
         self.sql
             .query_map_vec(
                 "SELECT addr FROM transports
-                WHERE is_published=1
-                AND addr NOT IN (SELECT value FROM config WHERE keyname='configured_addr')",
+                WHERE is_published
+                AND addr NOT IN (SELECT value FROM config WHERE keyname='configured_addr')
+                ORDER BY add_timestamp DESC",
                 (),
                 |row| {
                     let addr: String = row.get(0)?;

src/configure.rs

@@ -275,30 +275,34 @@ impl Context {
     /// Unpublished transports are not advertised to contacts,
     /// and self-sent messages are not sent there,
     /// so that we don't cause extra messages to the corresponding inbox,
-    /// but can still receive messages from contacts who don't know the new relay addresses yet.
+    /// but can still receive messages from contacts who don't know our new transport addresses yet.
     ///
-    /// The default is true, but when updating,
+    /// The default is false, but when the user updates from a version that didn't have this flag,
     /// existing secondary transports are set to unpublished,
     /// so that an existing transport address doesn't suddenly get spammed with a lot of messages.
     pub async fn set_transport_unpublished(&self, addr: &str, unpublished: bool) -> Result<()> {
         // We need to update the timestamp so that the key's timestamp changes
         // and is recognized as newer by our peers
         self.sql
             .transaction(|trans| {
-                let primary_addr: String = trans.query_row(
-                    "SELECT value FROM config WHERE keyname='configured_addr'",
-                    (),
-                    |row| row.get(0),
-                )?;
+                let primary_addr: String = trans
+                    .query_row(
+                        "SELECT value FROM config WHERE keyname='configured_addr'",
+                        (),
+                        |row| row.get(0),
+                    )
+                    .context("Select primary address")?;
                 if primary_addr == addr && unpublished {
                     bail!("Can't set primary relay as unpublished");
                 }
-                trans.execute(
-                    "UPDATE transports SET is_published=?, add_timestamp=? WHERE addr=?",
-                    (!unpublished, time(), addr),
-                )?;
+                trans
+                    .execute(
+                        "UPDATE transports SET is_published=?, add_timestamp=? WHERE addr=? AND is_published!=?1",
+                        (!unpublished, time(), addr),
+                    )
+                    .context("Update transports")?;
                 Ok(())
-            })
+            })h
             .await?;
         send_sync_transports(self).await?;
         Ok(())

src/sql/migrations.rs

@@ -2347,8 +2347,8 @@ ALTER TABLE contacts ADD COLUMN name_normalized TEXT;
     // Unpublished transports are not advertised to contacts,
     // and self-sent messages are not sent there,
     // so that we don't cause extra messages to the corresponding inbox,
-    // but can still receive messages from contacts who don't know the new relay addresses yet.
-    // The default is true, but when updating,
+    // but can still receive messages from contacts who don't know our new transport addresses yet.
+    // The default is true, but when when the user updates the app,
     // existing secondary transports are set to unpublished,
     // so that an existing transport address doesn't suddenly get spammed with a lot of messages.
     inc_and_check(&mut migration_version, 149)?;