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

Change Account.photoPath to Account.Identicon

This commit is contained in:
Samuel Hawksby-Robinson 2020-12-01 13:00:51 +00:00 committed by Andrea Maria Piana
parent a087535274
commit 9f525d32c4
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
multiaccounts/database.go
View File

@ -13,6 +13,7 @@ import (
type Account struct { type Account struct {
Name string `json:"name"` Name string `json:"name"`
Timestamp int64 `json:"timestamp"` Timestamp int64 `json:"timestamp"`
Identicon string `json:"identicon"`
KeycardPairing string `json:"keycard-pairing"` KeycardPairing string `json:"keycard-pairing"`
KeyUID string `json:"key-uid"` KeyUID string `json:"key-uid"`
Images []images.IdentityImage `json:"images"` Images []images.IdentityImage `json:"images"`
@ -40,7 +41,7 @@ func (db *Database) Close() error {
} }
func (db *Database) GetAccounts() ([]Account, error) { func (db *Database) GetAccounts() ([]Account, error) {
rows, err := db.db.Query("SELECT a.name, a.loginTimestamp, a.keycardPairing, a.keyUid, ii.name, ii.image_payload, ii.width, ii.height, ii.file_size, ii.resize_target FROM accounts AS a LEFT JOIN identity_images AS ii ON ii.key_uid = a.keyUid ORDER BY loginTimestamp DESC") rows, err := db.db.Query("SELECT a.name, a.loginTimestamp, a.identicon, a.keycardPairing, a.keyUid, ii.name, ii.image_payload, ii.width, ii.height, ii.file_size, ii.resize_target FROM accounts AS a LEFT JOIN identity_images AS ii ON ii.key_uid = a.keyUid ORDER BY loginTimestamp DESC")
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -51,6 +52,7 @@ func (db *Database) GetAccounts() ([]Account, error) {
accLoginTimestamp := sql.NullInt64{} accLoginTimestamp := sql.NullInt64{}
for rows.Next() { for rows.Next() {
acc := Account{} acc := Account{}
accIdenticon := sql.NullString{}
ii := &images.IdentityImage{} ii := &images.IdentityImage{}
iiName := sql.NullString{} iiName := sql.NullString{}
iiWidth := sql.NullInt64{} iiWidth := sql.NullInt64{}
@ -61,6 +63,7 @@ func (db *Database) GetAccounts() ([]Account, error) {
err = rows.Scan( err = rows.Scan(
&acc.Name, &acc.Name,
&accLoginTimestamp, &accLoginTimestamp,
&accIdenticon,
&acc.KeycardPairing, &acc.KeycardPairing,
&acc.KeyUID, &acc.KeyUID,
&iiName, &iiName,
@ -75,6 +78,7 @@ func (db *Database) GetAccounts() ([]Account, error) {
} }
acc.Timestamp = accLoginTimestamp.Int64 acc.Timestamp = accLoginTimestamp.Int64
acc.Identicon = accIdenticon.String
ii.KeyUID = acc.KeyUID ii.KeyUID = acc.KeyUID
ii.Name = iiName.String ii.Name = iiName.String
@ -109,12 +113,12 @@ func (db *Database) GetAccounts() ([]Account, error) {
} }
func (db *Database) SaveAccount(account Account) error { func (db *Database) SaveAccount(account Account) error {
_, err := db.db.Exec("INSERT OR REPLACE INTO accounts (name, keycardPairing, keyUid) VALUES (?, ?, ?)", account.Name, account.KeycardPairing, account.KeyUID) _, err := db.db.Exec("INSERT OR REPLACE INTO accounts (name, identicon, keycardPairing, keyUid) VALUES (?, ?, ?)", account.Name, account.Identicon, account.KeycardPairing, account.KeyUID)
return err return err
} }
func (db *Database) UpdateAccount(account Account) error { func (db *Database) UpdateAccount(account Account) error {
_, err := db.db.Exec("UPDATE accounts SET name = ?, keycardPairing = ? WHERE keyUid = ?", account.Name, account.KeycardPairing, account.KeyUID) _, err := db.db.Exec("UPDATE accounts SET name = ?, identicon = ?, keycardPairing = ? WHERE keyUid = ?", account.Name, account.Identicon, account.KeycardPairing, account.KeyUID)
return err return err
} }