fix(NativeTree): Set location to Local

see #1749

Signed-off-by: Marcel Klehr <[email protected]>

Author: marcelklehr

src/lib/adapters/Caching.ts

@@ -18,13 +18,15 @@ export default class CachingAdapter implements Adapter, BulkImportResource<TItem
   protected highestId: number
   protected bookmarksCache: Folder<TItemLocation>
   protected server: any
+  protected location: TItemLocation = ItemLocation.SERVER
+
   constructor(server: any) {
     this.resetCache()
   }
 
   resetCache() {
     this.highestId = 0
-    this.bookmarksCache = new Folder({ id: 0, title: 'root', location: ItemLocation.SERVER })
+    this.bookmarksCache = new Folder({ id: 0, title: 'root', location: this.location })
   }
 
   getLabel():string {
@@ -113,7 +115,7 @@ export default class CachingAdapter implements Adapter, BulkImportResource<TItem
 
   async createFolder(folder:Folder<TItemLocation>): Promise<string|number> {
     Logger.log('CREATEFOLDER', { folder })
-    const newFolder = new Tree.Folder({ id: ++this.highestId, parentId: folder.parentId, title: folder.title, location: ItemLocation.SERVER })
+    const newFolder = new Tree.Folder({ id: ++this.highestId, parentId: folder.parentId, title: folder.title, location: this.location })
     const foundParentFolder = this.bookmarksCache.findFolder(newFolder.parentId)
     if (!foundParentFolder) {
       throw new UnknownCreateTargetError()

src/lib/native/NativeTree.ts

@@ -1,12 +1,13 @@
 import { Preferences as Storage } from '@capacitor/preferences'
-import { Bookmark, Folder, ItemLocation } from '../Tree'
+import { Bookmark, Folder, ItemLocation, TItemLocation } from '../Tree'
 import Ordering from '../interfaces/Ordering'
 import CachingAdapter from '../adapters/Caching'
 import IAccountStorage from '../interfaces/AccountStorage'
 import { BulkImportResource } from '../interfaces/Resource'
 
 export default class NativeTree extends CachingAdapter implements BulkImportResource<typeof ItemLocation.LOCAL> {
-  private tree: Folder<typeof ItemLocation.LOCAL>
+  protected location: TItemLocation = ItemLocation.LOCAL
+
   private storage: IAccountStorage
   private readonly accountId: string
   private saveTimeout: any
@@ -21,7 +22,7 @@ export default class NativeTree extends CachingAdapter implements BulkImportReso
     const {value: tree} = await Storage.get({key: `bookmarks[${this.accountId}].tree`})
     const {value: highestId} = await Storage.get({key: `bookmarks[${this.accountId}].highestId`})
     if (tree) {
-      const oldHash = this.bookmarksCache && await this.bookmarksCache.clone(false).hash(true)
+      const oldHash = this.bookmarksCache && await this.bookmarksCache.cloneWithLocation(false, this.location).hash(true)
       this.bookmarksCache = Folder.hydrate(JSON.parse(tree)).clone(false)
       const newHash = await this.bookmarksCache.hash(true)
       this.highestId = parseInt(highestId)