status-im
/
status-go
mirror of https://github.com/status-im/status-go.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Make sure message has correctly set contact notification state 

In case we received a message with propagated state, the message state
wasn't correctly set in the database.
This commit is contained in:
Andrea Maria Piana 2023-02-16 16:01:11 +00:00
parent 08403df4c0
commit dab0e5d6d3
4 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
0.131.5
0.131.6

10
protocol/messenger_contact_requests_test.go
View File

@ -114,6 +114,16 @@ func (s *MessengerContactRequestSuite) TestReceiveAndAcceptContactRequest() { //
s.Require().Equal(resp.ActivityCenterNotifications()[0].Accepted, false)
s.Require().Equal(resp.ActivityCenterNotifications()[0].Dismissed, false)
s.Require().Equal(common.ContactRequestStatePending, resp.Messages()[0].ContactRequestState)
notifications, err := theirMessenger.ActivityCenterNotifications("", 10)
s.Require().NoError(err)
s.Require().Len(notifications.Notifications, 1)
s.Require().NotNil(common.ContactRequestStatePending, notifications.Notifications[0].Message)
s.Require().Equal(common.ContactRequestStatePending, notifications.Notifications[0].Message.ContactRequestState)
// Check the contact state is correctly set
s.Require().Len(resp.Contacts, 1)
s.Require().Equal(ContactRequestStateReceived, resp.Contacts[0].ContactRequestRemoteState)

5
protocol/messenger_handler.go
View File

@ -1750,6 +1750,11 @@ func (m *Messenger) HandleChatMessage(state *ReceivedMessageState) error {
}
}
if result.newContactRequestReceived {
if contact.hasAddedUs() && !contact.mutual() {
receivedMessage.ContactRequestState = common.ContactRequestStatePending
}
err = m.createContactRequestNotification(contact, state, receivedMessage, true)
if err != nil {
return err