From a75ef365b853556b2308162886b1583ea0b1f4b1 Mon Sep 17 00:00:00 2001
From: Mikunj Varsani <mikunj@live.com.au>
Date: Tue, 11 Feb 2020 10:18:41 +1100
Subject: [PATCH] Fix device unlinking. Fix session request being sent even if
 we have keys to setup a session. Fix minor crash.

---
 js/models/messages.js                            |  2 +-
 libtextsecure/message_receiver.js                |  3 ++-
 libtextsecure/sendmessage.js                     | 10 +++++++++-
 stylesheets/_modules.scss                        |  1 +
 ts/components/conversation/GroupNotification.tsx |  2 +-
 ts/components/session/SessionClosableOverlay.tsx |  5 +++--
 6 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/js/models/messages.js b/js/models/messages.js
index 03bd93642..c79ca9c11 100644
--- a/js/models/messages.js
+++ b/js/models/messages.js
@@ -205,7 +205,7 @@
     },
     getLokiNameForNumber(number) {
       const conversation = ConversationController.get(number);
-      if (!conversation) {
+      if (!conversation || !conversation.getLokiProfile()) {
         return number;
       }
       return conversation.getLokiProfile().displayName;
diff --git a/libtextsecure/message_receiver.js b/libtextsecure/message_receiver.js
index 5d6fca573..3195d2a35 100644
--- a/libtextsecure/message_receiver.js
+++ b/libtextsecure/message_receiver.js
@@ -1314,8 +1314,9 @@ MessageReceiver.prototype.extend({
               primaryPubKey
             );
 
+            // If we don't have a mapping on the primary then we have been unlinked
             if (!primaryMapping) {
-              return false;
+              return true;
             }
 
             // We expect the primary device to have updated its mapping
diff --git a/libtextsecure/sendmessage.js b/libtextsecure/sendmessage.js
index 0d30f83c3..a53c0c258 100644
--- a/libtextsecure/sendmessage.js
+++ b/libtextsecure/sendmessage.js
@@ -411,7 +411,7 @@ MessageSender.prototype = {
 
     const ourNumber = textsecure.storage.user.getNumber();
 
-    numbers.forEach(number => {
+    numbers.forEach(async number => {
       // Note: if we are sending a private group message, we do our best to
       // ensure we have signal protocol sessions with every member, but if we
       // fail, let's at least send messages to those members with which we do:
@@ -420,9 +420,17 @@ MessageSender.prototype = {
         s => s.number === number
       );
 
+      let keysFound = false;
+      // If we don't have a session but we already have prekeys to
+      // start communication then we should use them
+      if (!haveSession && !options.isPublic) {
+        keysFound = await outgoing.getKeysForNumber(number, []);
+      }
+
       if (
         number === ourNumber ||
         haveSession ||
+        keysFound ||
         options.isPublic ||
         options.messageType === 'friend-request'
       ) {
diff --git a/stylesheets/_modules.scss b/stylesheets/_modules.scss
index 097920c68..99234384c 100644
--- a/stylesheets/_modules.scss
+++ b/stylesheets/_modules.scss
@@ -1241,6 +1241,7 @@
   margin: 10px auto;
   padding: 5px 20px;
   border-radius: 4px;
+  word-break: break-word;
 }
 
 .module-group-notification__contact {
diff --git a/ts/components/conversation/GroupNotification.tsx b/ts/components/conversation/GroupNotification.tsx
index 9cec3d1bf..b1484bbb4 100644
--- a/ts/components/conversation/GroupNotification.tsx
+++ b/ts/components/conversation/GroupNotification.tsx
@@ -38,7 +38,7 @@ export class GroupNotification extends React.Component<Props> {
               key={`external-${contact.phoneNumber}`}
               className="module-group-notification__contact"
             >
-              {contact.profileName}
+              {contact.profileName || contact.phoneNumber}
             </span>
           );
 
diff --git a/ts/components/session/SessionClosableOverlay.tsx b/ts/components/session/SessionClosableOverlay.tsx
index e632504fd..d0d33cf14 100644
--- a/ts/components/session/SessionClosableOverlay.tsx
+++ b/ts/components/session/SessionClosableOverlay.tsx
@@ -56,9 +56,10 @@ export class SessionClosableOverlay extends React.Component<Props, State> {
 
     const conversationList = conversations.filter((conversation: any) => {
       // TODO: We need to handle the case with > 1 secondary device
-      const isOurDevice = conversation.isMe() || conversation.isOurConversation();
+      const isOurDevice =
+        conversation.isMe() || conversation.isOurConversation();
       return (
-        !isOurDevice&&
+        !isOurDevice &&
         conversation.isPrivate() &&
         !conversation.isSecondaryDevice() &&
         conversation.isFriend()