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

Fix segmentation failure on mailserver

This commit is contained in:
Volodymyr Kozieiev 2021-01-25 15:49:13 +02:00 committed by Andrea Maria Piana
parent d8bccaff18
commit 31f2196cb2
1 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
protocol/messenger.go
View File

@ -441,7 +441,7 @@ func (m *Messenger) handleConnectionChange(online bool) {
} }
if m.shouldPublishContactCode { if m.shouldPublishContactCode {
if err := m.handleSendContactCode(); err != nil { if err := m.publishContactCode(); err != nil {
m.logger.Error("could not publish on contact code", zap.Error(err)) m.logger.Error("could not publish on contact code", zap.Error(err))
return return
} }
@ -476,9 +476,9 @@ func (m *Messenger) buildContactCodeAdvertisement() (*protobuf.ContactCodeAdvert
}, nil }, nil
} }
// handleSendContactCode sends a public message wrapped in the encryption // publishContactCode sends a public message wrapped in the encryption
// layer, which will propagate our bundle // layer, which will propagate our bundle
func (m *Messenger) handleSendContactCode() error { func (m *Messenger) publishContactCode() error {
var payload []byte var payload []byte
m.logger.Debug("sending contact code") m.logger.Debug("sending contact code")
contactCodeAdvertisement, err := m.buildContactCodeAdvertisement() contactCodeAdvertisement, err := m.buildContactCodeAdvertisement()
@ -489,7 +489,7 @@ func (m *Messenger) handleSendContactCode() error {
if contactCodeAdvertisement == nil { if contactCodeAdvertisement == nil {
contactCodeAdvertisement = &protobuf.ContactCodeAdvertisement{} contactCodeAdvertisement = &protobuf.ContactCodeAdvertisement{}
} }
err = m.handleContactCodeChatIdentity(contactCodeAdvertisement) err = m.attachChatIdentity(contactCodeAdvertisement)
if err != nil { if err != nil {
return err return err
} }
@ -516,31 +516,33 @@ func (m *Messenger) handleSendContactCode() error {
// contactCodeAdvertisement attaches a protobuf.ChatIdentity to the given protobuf.ContactCodeAdvertisement, // contactCodeAdvertisement attaches a protobuf.ChatIdentity to the given protobuf.ContactCodeAdvertisement,
// if the `shouldPublish` conditions are met // if the `shouldPublish` conditions are met
func (m *Messenger) handleContactCodeChatIdentity(cca *protobuf.ContactCodeAdvertisement) error { func (m *Messenger) attachChatIdentity(cca *protobuf.ContactCodeAdvertisement) error {
contactCodeTopic := transport.ContactCodeTopic(&m.identity.PublicKey) contactCodeTopic := transport.ContactCodeTopic(&m.identity.PublicKey)
shouldPublish, err := m.shouldPublishChatIdentity(contactCodeTopic) shouldPublish, err := m.shouldPublishChatIdentity(contactCodeTopic)
if err != nil { if err != nil {
return err return err
} }
if shouldPublish { if !shouldPublish {
cca.ChatIdentity, err = m.createChatIdentity(privateChat) return nil
if err != nil { }
return err
}
img, err := m.multiAccounts.GetIdentityImage(m.account.KeyUID, userimage.SmallDimName) cca.ChatIdentity, err = m.createChatIdentity(privateChat)
if err != nil { if err != nil {
return err return err
} }
if img == nil {
return errors.New("could not find image")
}
err = m.persistence.SaveWhenChatIdentityLastPublished(contactCodeTopic, img.Hash()) img, err := m.multiAccounts.GetIdentityImage(m.account.KeyUID, userimage.SmallDimName)
if err != nil { if err != nil {
return err return err
} }
if img == nil {
return errors.New("could not find image")
}
err = m.persistence.SaveWhenChatIdentityLastPublished(contactCodeTopic, img.Hash())
if err != nil {
return err
} }
return nil return nil
@ -599,6 +601,9 @@ func (m *Messenger) handleStandaloneChatIdentity(chat *Chat) error {
// shouldPublishChatIdentity returns true if the last time the ChatIdentity was attached was more than 24 hours ago // shouldPublishChatIdentity returns true if the last time the ChatIdentity was attached was more than 24 hours ago
func (m *Messenger) shouldPublishChatIdentity(chatID string) (bool, error) { func (m *Messenger) shouldPublishChatIdentity(chatID string) (bool, error) {
if m.account == nil {
return false, nil
}
// Check we have at least one image // Check we have at least one image
img, err := m.multiAccounts.GetIdentityImage(m.account.KeyUID, userimage.SmallDimName) img, err := m.multiAccounts.GetIdentityImage(m.account.KeyUID, userimage.SmallDimName)
@ -722,7 +727,7 @@ func (m *Messenger) handleEncryptionLayerSubscriptions(subscriptions *encryption
for { for {
select { select {
case <-subscriptions.SendContactCode: case <-subscriptions.SendContactCode:
if err := m.handleSendContactCode(); err != nil { if err := m.publishContactCode(); err != nil {
m.logger.Error("failed to publish contact code", zap.Error(err)) m.logger.Error("failed to publish contact code", zap.Error(err))
} }
// we also piggy-back to clean up cached messages // we also piggy-back to clean up cached messages
@ -898,7 +903,7 @@ func (m *Messenger) watchIdentityImageChanges() {
select { select {
case <-channel: case <-channel:
if m.online() { if m.online() {
if err := m.handleSendContactCode(); err != nil { if err := m.publishContactCode(); err != nil {
m.logger.Error("failed to publish contact code", zap.Error(err)) m.logger.Error("failed to publish contact code", zap.Error(err))
} }
@ -920,7 +925,7 @@ func (m *Messenger) handlePushNotificationClientRegistrations(c chan struct{}) {
if !more { if !more {
return return
} }
if err := m.handleSendContactCode(); err != nil { if err := m.publishContactCode(); err != nil {
m.logger.Error("failed to publish contact code", zap.Error(err)) m.logger.Error("failed to publish contact code", zap.Error(err))
} }