From ab15a4afd6f82764d8c339e39347ab2219dfa0a4 Mon Sep 17 00:00:00 2001
From: Beaudan <beau@loki.network>
Date: Mon, 17 Jun 2019 11:56:54 +1000
Subject: [PATCH] Review moving status setting to conversation init

---
 js/models/conversations.js       | 11 +++++++++--
 libtextsecure/account_manager.js |  1 -
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/js/models/conversations.js b/js/models/conversations.js
index 1afc25e10..a5d16afad 100644
--- a/js/models/conversations.js
+++ b/js/models/conversations.js
@@ -167,6 +167,9 @@
 
       // Online status handling
       this.set({ isOnline: lokiP2pAPI.isOnline(this.id) });
+      if (this.id === this.ourNumber) {
+        this.setFriendRequestStatus(FriendRequestStatusEnum.friends);
+      }
 
       this.messageSendQueue = new JobQueue();
 
@@ -642,8 +645,12 @@
     async setFriendRequestStatus(newStatus) {
       // Ensure that the new status is a valid FriendStatusEnum value
       if (!(newStatus in Object.values(FriendRequestStatusEnum))) return;
-      const me = textsecure.storage.user.getNumber();
-      if (me === this.id && newStatus !== FriendRequestStatusEnum.friends) return;
+      if (
+        this.ourNumber === this.id &&
+        newStatus !== FriendRequestStatusEnum.friends
+      ) {
+        return;
+      }
       if (this.get('friendRequestStatus') !== newStatus) {
         this.set({ friendRequestStatus: newStatus });
         await window.Signal.Data.updateConversation(this.id, this.attributes, {
diff --git a/libtextsecure/account_manager.js b/libtextsecure/account_manager.js
index 80143a443..e09aaf05d 100644
--- a/libtextsecure/account_manager.js
+++ b/libtextsecure/account_manager.js
@@ -537,7 +537,6 @@
       // Update the conversation if we have it
       const newProfile = storage.getLocalProfile();
       await conversation.setProfile(newProfile);
-      await conversation.setFriendRequestStatus(window.friends.friendRequestStatusEnum.friends);
 
       this.dispatchEvent(new Event('registration'));
     },