From 745d0e82d4c0789659698ab4a5348d3f2fa74c5f Mon Sep 17 00:00:00 2001
From: Mikunj <mikunj@live.com.au>
Date: Thu, 15 Nov 2018 12:01:25 +1100
Subject: [PATCH] Added unread count badge .

---
 js/models/conversations.js        | 6 +++++-
 libtextsecure/message_receiver.js | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/js/models/conversations.js b/js/models/conversations.js
index 6d36b8eec..bcd00d8af 100644
--- a/js/models/conversations.js
+++ b/js/models/conversations.js
@@ -460,10 +460,13 @@
         }
       }
     },
-    async onFriendRequestAccepted() {
+    async onFriendRequestAccepted(updateUnread = false) {
+      // Make sure we don't keep incrementing the unread count
+      const unreadCount = this.isKeyExchangeCompleted() || !updateUnread ? {} : { unreadCount: this.get('unreadCount') + 1 };
       this.set({
         friendRequestStatus: null,
         keyExchangeCompleted: true,
+        ...unreadCount
       });
 
       await window.Signal.Data.updateConversation(this.id, this.attributes, {
@@ -715,6 +718,7 @@
       this.set({
         active_at: Date.now(),
         timestamp: Date.now(),
+        unreadCount: this.get('unreadCount') + 1,
       });
 
       await window.Signal.Data.updateConversation(this.id, this.attributes, {
diff --git a/libtextsecure/message_receiver.js b/libtextsecure/message_receiver.js
index 3690ecc43..080b22888 100644
--- a/libtextsecure/message_receiver.js
+++ b/libtextsecure/message_receiver.js
@@ -1028,7 +1028,7 @@ MessageReceiver.prototype.extend({
             );
 
             // Update the conversation
-            await conversation.onFriendRequestAccepted();
+            await conversation.onFriendRequestAccepted(true);
           }
         }
       }