Skip to content
Snippets Groups Projects
Commit b2defd2a authored by Jono Wenger's avatar Jono Wenger
Browse files

Move database name saving out of v1Upgrade

parent 32f2d7ae
Branches
Tags
2 merge requests!67fix for latest client release,!52XX-4382 / Move indexedDb databases to web workers
...@@ -89,6 +89,13 @@ func newWASMModel(databaseName string, encryption cryptoChannel.Cipher, ...@@ -89,6 +89,13 @@ func newWASMModel(databaseName string, encryption cryptoChannel.Cipher,
return nil, err return nil, err
} }
// Get the database name and save it to storage
if dbName, err2 := db.Name(); err2 != nil {
return nil, err2
} else if err = storeDatabaseName(dbName); err != nil {
return nil, err
}
// Save the encryption status to storage // Save the encryption status to storage
encryptionStatus := encryption != nil encryptionStatus := encryption != nil
loadedEncryptionStatus, err := loadedEncryptionStatus, err :=
...@@ -165,13 +172,6 @@ func v1Upgrade(db *idb.Database) error { ...@@ -165,13 +172,6 @@ func v1Upgrade(db *idb.Database) error {
return err return err
} }
// Get the database name and save it to storage
if databaseName, err2 := db.Name(); err2 != nil {
return err2
} else if err = storeDatabaseName(databaseName); err != nil {
return err
}
return nil return nil
} }
......
...@@ -63,8 +63,7 @@ func newWASMModel(databaseName string, encryption cryptoChannel.Cipher, ...@@ -63,8 +63,7 @@ func newWASMModel(databaseName string, encryption cryptoChannel.Cipher,
openRequest, err := idb.Global().Open(ctx, databaseName, currentVersion, openRequest, err := idb.Global().Open(ctx, databaseName, currentVersion,
func(db *idb.Database, oldVersion, newVersion uint) error { func(db *idb.Database, oldVersion, newVersion uint) error {
if oldVersion == newVersion { if oldVersion == newVersion {
jww.INFO.Printf("IndexDb version is current: v%d", jww.INFO.Printf("IndexDb version is current: v%d", newVersion)
newVersion)
return nil return nil
} }
...@@ -92,6 +91,13 @@ func newWASMModel(databaseName string, encryption cryptoChannel.Cipher, ...@@ -92,6 +91,13 @@ func newWASMModel(databaseName string, encryption cryptoChannel.Cipher,
return nil, err return nil, err
} }
// Get the database name and save it to storage
if dbName, err2 := db.Name(); err2 != nil {
return nil, err2
} else if err = storeDatabaseName(dbName); err != nil {
return nil, err
}
// Save the encryption status to storage // Save the encryption status to storage
encryptionStatus := encryption != nil encryptionStatus := encryption != nil
loadedEncryptionStatus, err := loadedEncryptionStatus, err :=
...@@ -167,13 +173,6 @@ func v1Upgrade(db *idb.Database) error { ...@@ -167,13 +173,6 @@ func v1Upgrade(db *idb.Database) error {
return err return err
} }
// Get the database name and save it to storage
if databaseName, err2 := db.Name(); err2 != nil {
return err2
} else if err = storeDatabaseName(databaseName); err != nil {
return err
}
return nil return nil
} }
...@@ -213,6 +212,7 @@ func RegisterDatabaseNameStore(m *manager) { ...@@ -213,6 +212,7 @@ func RegisterDatabaseNameStore(m *manager) {
"response about storing the database name in local "+ "response about storing the database name in local "+
"storage in the main thread", indexedDbWorker.ResponseTimeout) "storage in the main thread", indexedDbWorker.ResponseTimeout)
} }
return nil return nil
} }
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment