Fix some problems by overtaking data from the server on creation

marcelklehr · marcelklehr · commit b72a4ea4c935 · 2018-05-09T20:24:22.000+02:00
in case it was changed
diff --git a/src/lib/Account.js b/src/lib/Account.js
@@ -185,9 +185,10 @@ export default class Account {
           // ignore this bookmark as it's not supported by the server
           return
         }
-        bookmark.id = serverMark.id
-        await this.storage.addToMappings(bookmark)
-        await this.storage.addToCache(bookmark.localId, await serverMark.hash())
+        serverMark.localId = bookmark.localId
+        await this.tree.updateNode(serverMark)
+        await this.storage.addToMappings(serverMark)
+        await this.storage.addToCache(serverMark.localId, await serverMark.hash())
       },
       BATCH_SIZE
     )

Original file line number	Diff line number	Diff line change
`@@ -185,9 +185,10 @@ export default class Account {`
`185`	`185`	`// ignore this bookmark as it's not supported by the server`
`186`	`186`	`return`
`187`	`187`	`}`
`188`		`- bookmark.id = serverMark.id`
`189`		`- await this.storage.addToMappings(bookmark)`
`190`		`- await this.storage.addToCache(bookmark.localId, await serverMark.hash())`
	`188`	`+ serverMark.localId = bookmark.localId`
	`189`	`+ await this.tree.updateNode(serverMark)`
	`190`	`+ await this.storage.addToMappings(serverMark)`
	`191`	`+ await this.storage.addToCache(serverMark.localId, await serverMark.hash())`
`191`	`192`	`},`
`192`	`193`	`BATCH_SIZE`
`193`	`194`	`)`