From a89dc020e11dc64c012248b9dcc30ca340f7f574 Mon Sep 17 00:00:00 2001
From: Igor Sirotin <sirotin@status.im>
Date: Wed, 20 Sep 2023 17:26:04 +0100
Subject: [PATCH] fix: don't save sender as contact for certain message types
 (#4052)

---
 protocol/messenger.go | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/protocol/messenger.go b/protocol/messenger.go
index 30293b89c..b1750f3ed 100644
--- a/protocol/messenger.go
+++ b/protocol/messenger.go
@@ -3615,8 +3615,10 @@ func (m *Messenger) handleRetrievedMessages(chatWithMessages map[transport.Filte
 						continue
 					}
 					contact = c
-					messageState.AllContacts.Store(senderID, contact)
-					m.forgetContactInfoRequest(senderID)
+					if msg.Type != protobuf.ApplicationMetadataMessage_PUSH_NOTIFICATION_QUERY {
+						messageState.AllContacts.Store(senderID, contact)
+						m.forgetContactInfoRequest(senderID)
+					}
 				}
 				messageState.CurrentMessageState = &CurrentMessageState{
 					MessageID:        messageID,