Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix handling of sync message with blocked numbers #1411

Merged
merged 1 commit into from Aug 30, 2017

Conversation

scottnonnenberg
Copy link
Contributor

Previously we were crashing whenever we got a sync message with blocked messages.

Copy link
Contributor

@liliakai liliakai left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Alternatively, could we drop the envelope arg from the caller since it's not used in handleBlocked?

@scottnonnenberg scottnonnenberg merged commit 4011e26 into master Aug 30, 2017
@scottnonnenberg scottnonnenberg deleted the fix-blocked branch August 30, 2017 18:55
@scottnonnenberg
Copy link
Contributor Author

I think it's worth keeping, for consistency in handleSyncMessage:

        } else if (syncMessage.contacts) {
            return this.handleContacts(envelope, syncMessage.contacts);
        } else if (syncMessage.groups) {
            return this.handleGroups(envelope, syncMessage.groups);
        } else if (syncMessage.blocked) {
            return this.handleBlocked(envelope, syncMessage.blocked);
        } else if (syncMessage.request) {
            console.log('Got SyncMessage Request');
            return this.removeFromCache(envelope);
        } else if (syncMessage.read && syncMessage.read.length) {
            console.log('read messages',
                    'from', envelope.source + '.' + envelope.sourceDevice);
            return this.handleRead(envelope, syncMessage.read);
        } else if (syncMessage.verified) {
            return this.handleVerified(envelope, syncMessage.verified);
        } else {

scottnonnenberg added a commit that referenced this pull request Aug 30, 2017
Properly handle update of blocked numbers sync'd from mobile
device (#1411)

Fix some bugs with migration to Electron (still behind a flag)
  - Dark Theme: Increase banner text contrast for legibility (#1415)
  - Better disambiguate conversation directory names (#1409)
  - Handle long group or contact names (#1402)
  - Redact group ids in export logging (#1402)

Better logging
  - Don't log expiration if queued task threw an error (#1412)
  - Additional error handling/logging during contact sync (#1395)

Remove unknown group messages from cache - no need to retry! (#1414)

Update a large number of strings via transifex (#1403)

FREEBIE
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants