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

Update account name during displayName setting syncing

This commit is contained in:
Vitaliy Vlasov 2023-02-14 18:49:57 +02:00
parent f25088483c
commit 83a6dbfa3e
4 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
0.131.6 0.131.7

2
protocol/messenger_backup_handler.go
View File

@ -145,7 +145,7 @@ func (m *Messenger) handleBackedUpSettings(message *protobuf.SyncSetting) error
return nil return nil
} }
settingField, err := m.extractSyncSetting(message) settingField, err := m.extractAndSaveSyncSetting(message)
if err != nil { if err != nil {
m.logger.Warn("failed to handle SyncSetting from backed up message", zap.Error(err)) m.logger.Warn("failed to handle SyncSetting from backed up message", zap.Error(err))
return nil return nil

8
protocol/messenger_handler.go
View File

@ -1922,16 +1922,12 @@ func (m *Messenger) HandleRequestAddressForTransaction(messageState *ReceivedMes
} }
func (m *Messenger) handleSyncSetting(messageState *ReceivedMessageState, message *protobuf.SyncSetting) error { func (m *Messenger) handleSyncSetting(messageState *ReceivedMessageState, message *protobuf.SyncSetting) error {
settingField, err := m.extractSyncSetting(message) settingField, err := m.extractAndSaveSyncSetting(message)
if err != nil { if err != nil {
return err return err
} }
if message.GetType() == protobuf.SyncSetting_DISPLAY_NAME && settingField != nil { if message.GetType() == protobuf.SyncSetting_DISPLAY_NAME && settingField != nil {
oldDisplayName, err := m.settings.DisplayName() if m.account.Name != message.GetValueString() {
if err != nil {
return err
}
if oldDisplayName != message.GetValueString() {
m.account.Name = message.GetValueString() m.account.Name = message.GetValueString()
err = m.multiAccounts.SaveAccount(*m.account) err = m.multiAccounts.SaveAccount(*m.account)
if err != nil { if err != nil {

2
protocol/messenger_sync_settings.go
View File

@ -76,7 +76,7 @@ func (m *Messenger) syncSettings(rawMessageHandler RawMessageHandler) error {
} }
// extractSyncSetting parses incoming *protobuf.SyncSetting and stores the setting data if needed // extractSyncSetting parses incoming *protobuf.SyncSetting and stores the setting data if needed
func (m *Messenger) extractSyncSetting(syncSetting *protobuf.SyncSetting) (*settings.SyncSettingField, error) { func (m *Messenger) extractAndSaveSyncSetting(syncSetting *protobuf.SyncSetting) (*settings.SyncSettingField, error) {
sf, err := settings.GetFieldFromProtobufType(syncSetting.Type) sf, err := settings.GetFieldFromProtobufType(syncSetting.Type)
if err != nil { if err != nil {
m.logger.Error( m.logger.Error(