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

Bug fix for IdentityImages not being empty when they are

This commit is contained in:
Samuel Hawksby-Robinson 2022-08-09 15:11:55 +01:00
parent 5eb8e5a34f
commit 5484b7ef9d
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
multiaccounts/database.go
View File

@ -139,7 +139,7 @@ func (db *Database) GetAccounts() (rst []Account, err error) {
} }
func (db *Database) GetAccount(keyUID string) (*Account, error) { func (db *Database) GetAccount(keyUID string) (*Account, error) {
rows, err := db.db.Query("SELECT a.name, a.loginTimestamp, a.identicon, a.colorHash, a.colorId, a.keycardPairing, a.keyUid, ii.name, ii.image_payload, ii.width, ii.height, ii.file_size, ii.resize_target, ii.clock FROM accounts AS a LEFT JOIN identity_images AS ii ON ii.key_uid = a.keyUid WHERE a.keyUid = ? ORDER BY loginTimestamp DESC", keyUID) rows, err := db.db.Query("SELECT a.name, a.loginTimestamp, a.identicon, a.colorHash, a.colorId, a.keycardPairing, a.keyUid, ii.key_uid, ii.name, ii.image_payload, ii.width, ii.height, ii.file_size, ii.resize_target, ii.clock FROM accounts AS a LEFT JOIN identity_images AS ii ON ii.key_uid = a.keyUid WHERE a.keyUid = ? ORDER BY loginTimestamp DESC", keyUID)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -156,6 +156,7 @@ func (db *Database) GetAccount(keyUID string) (*Account, error) {
accColorHash := sql.NullString{} accColorHash := sql.NullString{}
accColorID := sql.NullInt64{} accColorID := sql.NullInt64{}
ii := &images.IdentityImage{} ii := &images.IdentityImage{}
iiKeyUID := sql.NullString{}
iiName := sql.NullString{} iiName := sql.NullString{}
iiWidth := sql.NullInt64{} iiWidth := sql.NullInt64{}
iiHeight := sql.NullInt64{} iiHeight := sql.NullInt64{}
@ -171,6 +172,7 @@ func (db *Database) GetAccount(keyUID string) (*Account, error) {
&accColorID, &accColorID,
&acc.KeycardPairing, &acc.KeycardPairing,
&acc.KeyUID, &acc.KeyUID,
&iiKeyUID,
&iiName, &iiName,
&ii.Payload, &ii.Payload,
&iiWidth, &iiWidth,
@ -193,7 +195,7 @@ func (db *Database) GetAccount(keyUID string) (*Account, error) {
} }
} }
ii.KeyUID = acc.KeyUID ii.KeyUID = iiKeyUID.String
ii.Name = iiName.String ii.Name = iiName.String
ii.Width = int(iiWidth.Int64) ii.Width = int(iiWidth.Int64)
ii.Height = int(iiHeight.Int64) ii.Height = int(iiHeight.Int64)