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 stickers persistence (#1779)

This commit is contained in:
yenda 2020-01-10 16:12:09 +01:00 committed by Adam Babik
parent 41eaf0376c
commit d3de88f790
3 changed files with 9 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
go.sum
View File

@ -635,21 +635,6 @@ github.com/status-im/migrate/v4 v4.6.2-status.2 h1:SdC+sMDl/aI7vUlwD2qj2p7KsK4T6
github.com/status-im/migrate/v4 v4.6.2-status.2/go.mod h1:c/kc90n47GZu/58nnz1OMLTf7uE4Da4gZP5qmU+A/v8= github.com/status-im/migrate/v4 v4.6.2-status.2/go.mod h1:c/kc90n47GZu/58nnz1OMLTf7uE4Da4gZP5qmU+A/v8=
github.com/status-im/rendezvous v1.3.0 h1:7RK/MXXW+tlm0asKm1u7Qp7Yni6AO29a7j8+E4Lbjg4= github.com/status-im/rendezvous v1.3.0 h1:7RK/MXXW+tlm0asKm1u7Qp7Yni6AO29a7j8+E4Lbjg4=
github.com/status-im/rendezvous v1.3.0/go.mod h1:+hzjuP+j/XzLPeF6E50b88pWOTLdTcwjvNYt+Gh1W1s= github.com/status-im/rendezvous v1.3.0/go.mod h1:+hzjuP+j/XzLPeF6E50b88pWOTLdTcwjvNYt+Gh1W1s=
github.com/status-im/status-go/eth-node v1.0.0/go.mod h1:mfvJ7UQeB40WFLmageNPMBibFsxXIeN584MbGOyg/YM=
github.com/status-im/status-go/eth-node v1.1.0 h1:d4A2PTgp2djSoj6dnk8zhKKET1g2BmUUPRioU6IyAw8=
github.com/status-im/status-go/eth-node v1.1.0/go.mod h1:auS/ddHiTJHKQAS7k49VLYFYEI5DVDRdyeC8aszBQeg=
github.com/status-im/status-go/extkeys v1.0.0 h1:Qyirsoi5Ye5UFfisgPtCjPb/RkBxyK+UsSiEcr2PVlM=
github.com/status-im/status-go/extkeys v1.0.0/go.mod h1:GdqJbrcpkNm5ZsSCpp+PdMxnXx+OcRBdm3PI0rs1FpU=
github.com/status-im/status-go/extkeys v1.1.0 h1:QgnXlMvhlFyRu+GdpPn1Ve22IidnDdslFB/Py6HWj78=
github.com/status-im/status-go/extkeys v1.1.0/go.mod h1:nT/T2+G4L/6qPVIIfI3oT8dQSVyn7fQYY8G3yL3PIGY=
github.com/status-im/status-go/protocol v1.1.0 h1:WF/f9U/ha/Er+UcLtIIDy9fzMXv1svNADvuJkjhTGds=
github.com/status-im/status-go/protocol v1.1.0/go.mod h1:eViaoBKxf7gO30WqZ85zYfE8nJb4rLjIB43wKO2QOUA=
github.com/status-im/status-go/waku v1.0.0/go.mod h1:1bjvQAL4cJYtxCsm6DnKdJbxcZwnvvZmxb6pmoUDtuY=
github.com/status-im/status-go/waku v1.1.0 h1:3punlL9isUEAuccAvX5jnFWxuGnwr71LlTNcWDDeomA=
github.com/status-im/status-go/waku v1.1.0/go.mod h1:1bjvQAL4cJYtxCsm6DnKdJbxcZwnvvZmxb6pmoUDtuY=
github.com/status-im/status-go/whisper/v6 v6.0.1/go.mod h1:HDK3K15YaVQQHD6H7AMNszAMElu9iMRR9t6V0nWECJs=
github.com/status-im/status-go/whisper/v6 v6.1.0 h1:jFGK8zr5bXaFTcyS/xIKh/5TlyqUks+5kyivDUii/1c=
github.com/status-im/status-go/whisper/v6 v6.1.0/go.mod h1:csqMoPMkCPW1NJO56HJzNTWAl9UMdetnQzkPbPjsAC4=
github.com/status-im/tcp-shaker v0.0.0-20191114194237-215893130501 h1:oa0KU5jJRNtXaM/P465MhvSFo/HM2O8qi2DDuPcd7ro= github.com/status-im/tcp-shaker v0.0.0-20191114194237-215893130501 h1:oa0KU5jJRNtXaM/P465MhvSFo/HM2O8qi2DDuPcd7ro=
github.com/status-im/tcp-shaker v0.0.0-20191114194237-215893130501/go.mod h1:RYo/itke1oU5k/6sj9DNM3QAwtE5rZSgg5JnkOv83hk= github.com/status-im/tcp-shaker v0.0.0-20191114194237-215893130501/go.mod h1:RYo/itke1oU5k/6sj9DNM3QAwtE5rZSgg5JnkOv83hk=
github.com/steakknife/bloomfilter v0.0.0-20180922174646-6819c0d2a570 h1:gIlAHnH1vJb5vwEjIp5kBj/eu99p/bl0Ay2goiPe5xE= github.com/steakknife/bloomfilter v0.0.0-20180922174646-6819c0d2a570 h1:gIlAHnH1vJb5vwEjIp5kBj/eu99p/bl0Ay2goiPe5xE=

8
multiaccounts/accounts/database.go
View File

@ -67,8 +67,8 @@ type Settings struct {
PublicKey string `json:"public-key"` PublicKey string `json:"public-key"`
RememberSyncingChoice bool `json:"remember-syncing-choice?,omitempty"` RememberSyncingChoice bool `json:"remember-syncing-choice?,omitempty"`
SigningPhrase string `json:"signing-phrase"` SigningPhrase string `json:"signing-phrase"`
StickerPacksInstalled *json.RawMessage `json:"stickers-packs-installed,omitempty"` StickerPacksInstalled *json.RawMessage `json:"stickers/packs-installed,omitempty"`
StickersRecentStickers *json.RawMessage `json:"stickers-recent-stickers,omitempty"` StickersRecentStickers *json.RawMessage `json:"stickers/recent-stickers,omitempty"`
SyncingOnMobileNetwork bool `json:"syncing-on-mobile-network?,omitempty"` SyncingOnMobileNetwork bool `json:"syncing-on-mobile-network?,omitempty"`
Usernames *json.RawMessage `json:"usernames,omitempty"` Usernames *json.RawMessage `json:"usernames,omitempty"`
WalletRootAddress types.Address `json:"wallet-root-address,omitempty"` WalletRootAddress types.Address `json:"wallet-root-address,omitempty"`
@ -227,10 +227,10 @@ func (db *Database) SaveSetting(setting string, value interface{}) error {
return ErrInvalidConfig return ErrInvalidConfig
} }
update, err = db.db.Prepare("UPDATE settings SET remember_syncing_choice = ? WHERE synthetic_id = 'id'") update, err = db.db.Prepare("UPDATE settings SET remember_syncing_choice = ? WHERE synthetic_id = 'id'")
case "stickers-packs-installed": case "stickers/packs-installed":
value = &sqlite.JSONBlob{value} value = &sqlite.JSONBlob{value}
update, err = db.db.Prepare("UPDATE settings SET stickers_packs_installed = ? WHERE synthetic_id = 'id'") update, err = db.db.Prepare("UPDATE settings SET stickers_packs_installed = ? WHERE synthetic_id = 'id'")
case "stickers-recent-stickers": case "stickers/recent-stickers":
value = &sqlite.JSONBlob{value} value = &sqlite.JSONBlob{value}
update, err = db.db.Prepare("UPDATE settings SET stickers_recent_stickers = ? WHERE synthetic_id = 'id'") update, err = db.db.Prepare("UPDATE settings SET stickers_recent_stickers = ? WHERE synthetic_id = 'id'")
case "syncing-on-mobile-network?": case "syncing-on-mobile-network?":

10
vendor/modules.txt vendored
View File

@ -369,7 +369,7 @@ github.com/status-im/migrate/v4/source/go_bindata
github.com/status-im/rendezvous github.com/status-im/rendezvous
github.com/status-im/rendezvous/protocol github.com/status-im/rendezvous/protocol
github.com/status-im/rendezvous/server github.com/status-im/rendezvous/server
# github.com/status-im/status-go/eth-node v1.0.0 => ./eth-node # github.com/status-im/status-go/eth-node v1.1.0 => ./eth-node
github.com/status-im/status-go/eth-node/bridge/geth github.com/status-im/status-go/eth-node/bridge/geth
github.com/status-im/status-go/eth-node/bridge/geth/ens github.com/status-im/status-go/eth-node/bridge/geth/ens
github.com/status-im/status-go/eth-node/crypto github.com/status-im/status-go/eth-node/crypto
@ -377,9 +377,9 @@ github.com/status-im/status-go/eth-node/crypto/ecies
github.com/status-im/status-go/eth-node/keystore github.com/status-im/status-go/eth-node/keystore
github.com/status-im/status-go/eth-node/types github.com/status-im/status-go/eth-node/types
github.com/status-im/status-go/eth-node/types/ens github.com/status-im/status-go/eth-node/types/ens
# github.com/status-im/status-go/extkeys v1.0.0 => ./extkeys # github.com/status-im/status-go/extkeys v1.1.0 => ./extkeys
github.com/status-im/status-go/extkeys github.com/status-im/status-go/extkeys
# github.com/status-im/status-go/protocol v1.0.1 => ./protocol # github.com/status-im/status-go/protocol v1.1.0 => ./protocol
github.com/status-im/status-go/protocol github.com/status-im/status-go/protocol
github.com/status-im/status-go/protocol/datasync github.com/status-im/status-go/protocol/datasync
github.com/status-im/status-go/protocol/datasync/peer github.com/status-im/status-go/protocol/datasync/peer
@ -397,9 +397,9 @@ github.com/status-im/status-go/protocol/transport/whisper
github.com/status-im/status-go/protocol/transport/whisper/migrations github.com/status-im/status-go/protocol/transport/whisper/migrations
github.com/status-im/status-go/protocol/v1 github.com/status-im/status-go/protocol/v1
github.com/status-im/status-go/protocol/zaputil github.com/status-im/status-go/protocol/zaputil
# github.com/status-im/status-go/waku v1.0.0 => ./waku # github.com/status-im/status-go/waku v1.1.0 => ./waku
github.com/status-im/status-go/waku github.com/status-im/status-go/waku
# github.com/status-im/status-go/whisper/v6 v6.0.1 => ./whisper # github.com/status-im/status-go/whisper/v6 v6.1.0 => ./whisper
github.com/status-im/status-go/whisper/v6 github.com/status-im/status-go/whisper/v6
# github.com/status-im/tcp-shaker v0.0.0-20191114194237-215893130501 # github.com/status-im/tcp-shaker v0.0.0-20191114194237-215893130501
github.com/status-im/tcp-shaker github.com/status-im/tcp-shaker