fix(backup)_: dont generate a CR if the synced contact is mutual #6184
+34
−13
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Jenkins BuildsClick to see older builds (16)
|
jrainville
force-pushed
the
fix/restoring-contacts-weird-messages
branch
from
814e375 to
029ea03
Compare
jrainville
commented
Dec 9, 2024
| @@ -601,6 +601,7 @@ func (m *Messenger) generateContactRequest(clock uint64, timestamp uint64, conta | |||
| contactRequest := common.NewMessage() | |||
| contactRequest.ChatId = contact.ID | |||
| contactRequest.WhisperTimestamp = timestamp | |||
| contactRequest.Timestamp = timestamp | |||
There was a problem hiding this comment.
Without this, the message showed as being sent in 1970
jrainville
force-pushed
the
fix/restoring-contacts-weird-messages
branch
from
029ea03 to
4187ae9
Compare
|
@osmaczko @igor-sirotin friendly reminder to review |
osmaczko
reviewed
Dec 13, 2024
Fixes status-im/status-desktop#15849 The problem was that we generated a "fake" contact request for all synced contacts. While it's true that even mutual contacts have a contact request, we don't need it anymore once mutual and since we don't sync messages, we had to generate it with a default message and that message looked very out of place after a recovery.
jrainville
force-pushed
the
fix/restoring-contacts-weird-messages
branch
from
4187ae9 to
a417efe
Compare
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## develop #6184 +/- ##
===========================================
- Coverage 61.27% 61.21% -0.06%
===========================================
Files 833 833
Lines 109910 109913 +3
===========================================
- Hits 67348 67287 -61
- Misses 34711 34750 +39
- Partials 7851 7876 +25
Flags with carried forward coverage won't be shown. Click here to find out more.
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes status-im/status-desktop#15849
The problem was that we generated a "fake" contact request for all synced contacts. While it's true that even mutual contacts have a contact request, we don't need it anymore once mutual and since we don't sync messages, we had to generate it with a default message and that message looked very out of place after a recovery.
Mutual contact:
Contact that sent us a CR (not sure why the image and name don't show:
Contact to whom we sent a CR:
Now, the CR messages at least make sense