don't immediately subscribe to a new p2p topic, wait for the first message'

src/views/messages-view.jsx

@@ -188,11 +188,12 @@ class MessagesView extends React.Component {
     }
 
     if (topic && ((this.state.topic != prevState.topic) || !prevProps.ready)) {
-      if (topic._new) {
-        console.log('DEBUG: Fetching new topic description');
-        // topic.getMeta(topic.startMetaQuery().withDesc().build());
+      // Don't immediately subscribe to a new p2p topic, wait for the first message.
+      if (topic._new && topic.isP2PType()) {
+        topic.getMeta(topic.startMetaQuery().withDesc().build());
+      } else {
+        this.subscribe(topic);
       }
-      this.subscribe(topic);
     }
   }
 
@@ -380,7 +381,10 @@ class MessagesView extends React.Component {
         this.props.onNewTopicCreated(this.props.topic, ctrl.topic);
         // If there are unsent messages, try sending them now.
         topic.queuedMessages((pub) => {
-          if (!pub._sending && topic.isSubscribed()) {
+          if (pub._sending) {
+            return;
+          }
+          if (topic.isSubscribed()) {
             this.retrySend(pub);
           }
         });

src/views/tinode-web.jsx

@@ -960,14 +960,14 @@ class TinodeWeb extends React.Component {
   // with attachments.
   //  - msg - Drafty message with content
   //  - promise - Promise to be resolved when the upload is completed
-  //  - uploader - for tracking progress
+  //  - uploadCompletionPromise - for tracking progress
   //  - head - head dictionary to be attached to the message
-  handleSendMessage(msg, promise, uploader, head) {
+  handleSendMessage(msg, uploadCompletionPromise, uploader, head) {
     const topic = this.tinode.getTopic(this.state.topicSelected);
-    this.sendMessageToTopic(topic, msg, promise, uploader, head);
+    this.sendMessageToTopic(topic, msg, uploadCompletionPromise, uploader, head);
   }
 
-  sendMessageToTopic(topic, msg, promise, uploader, head) {
+  sendMessageToTopic(topic, msg, uploadCompletionPromise, uploader, head) {
     msg = topic.createMessage(msg, false);
     // The uploader is used to show progress.
     msg._uploader = uploader;
@@ -976,33 +976,33 @@ class TinodeWeb extends React.Component {
       msg.head = Object.assign(msg.head || {}, head);
     }
 
+    const completion = [];
+    if (uploadCompletionPromise) {
+      completion.push(uploadCompletionPromise);
+    }
+
     if (!topic.isSubscribed()) {
       // Topic is not subscribed yet. Subscribe.
-      if (!promise) {
-        promise = Promise.resolve();
-      }
-      promise = promise
-        .then(() => topic.subscribe())
-        .then(() => {
-          // If there are unsent messages, try sending them now.
-          topic.queuedMessages((pub) => {
-            if (!pub._sending && topic.isSubscribed()) {
-              topic.publishMessage(pub);
-            }
+      const subscribePromise =
+        topic.subscribe()
+          .then(() => {
+            // If there are unsent messages, try sending them now.
+            topic.queuedMessages(pub => {
+              if (pub._sending || pub.seq == msg.seq) {
+                return;
+              }
+              if (topic.isSubscribed()) {
+                topic.publishMessage(pub);
+              }
+            });
           });
-        });
+      completion.push(subscribePromise);
     }
 
-    if (promise) {
-      promise = promise.catch((err) => {
-        this.handleError(err.message, 'err');
-      });
-    }
-
-    topic.publishDraft(msg, promise)
-      .then((ctrl) => {
+    topic.publishDraft(msg, Promise.all(completion))
+      .then(_ => {
         if (topic.isArchived()) {
-          return topic.archive(false);
+          topic.archive(false);
         }
       })
       .catch((err) => {