fix(CachingAdapter): set initialTreeHash after getBookmarksTree

to make sure setHashSettings has been called before

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

Author: marcelklehr

src/lib/Tree.ts

@@ -87,6 +87,8 @@ export class Bookmark<L extends TItemLocation> {
   async hash({preserveOrder = false, hashFn = 'sha256'}: IHashSettings = {preserveOrder: false, hashFn: 'sha256'}):Promise<string> {
     if (!this.hashValue) {
       this.hashValue = {}
+    }
+    if (typeof this.hashValue[hashFn] !== 'undefined') {
       const json = JSON.stringify({ title: this.title, url: this.url })
       if (hashFn === 'sha256') {
         this.hashValue[hashFn] = await Crypto.sha256(json)

src/lib/adapters/Git.ts

@@ -15,6 +15,7 @@ import {
   SlashError
 } from '../../errors/Error'
 import Crypto from '../Crypto'
+import { Folder, TItemLocation } from '../Tree'
 
 const LOCK_INTERVAL = 2 * 60 * 1000 // Lock every 2mins while syncing
 const LOCK_TIMEOUT = 15 * 60 * 1000 // Override lock 0.25h after last time lock has been set
@@ -65,6 +66,13 @@ export default class GitAdapter extends CachingAdapter {
     this.cancelCallback && this.cancelCallback()
   }
 
+  async getBookmarksTree(): Promise<Folder<TItemLocation>> {
+    // setHashSettings is called after onSyncStart only but before getBookmarksTree
+    // thus we get the hash here again
+    this.initialTreeHash = await this.bookmarksCache.hash(this.hashSettings)
+    return super.getBookmarksTree()
+  }
+
   async onSyncStart(needLock = true, forceLock = false) {
     Logger.log('onSyncStart: begin')
 

src/lib/adapters/GoogleDrive.ts

@@ -12,6 +12,7 @@ import {
 } from '../../errors/Error'
 import { OAuth2Client } from '@byteowls/capacitor-oauth2'
 import { Capacitor, CapacitorHttp as Http } from '@capacitor/core'
+import { Folder, TItemLocation } from '../Tree'
 
 const OAuthConfig = {
   authorizationBaseUrl: 'https://accounts.google.com/o/oauth2/auth',
@@ -197,6 +198,13 @@ export default class GoogleDriveAdapter extends CachingAdapter {
     })
   }
 
+  async getBookmarksTree(): Promise<Folder<TItemLocation>> {
+    // setHashSettings is called after onSyncStart only but before getBookmarksTree
+    // thus we get the hash here again
+    this.initialTreeHash = await this.bookmarksCache.hash(this.hashSettings)
+    return super.getBookmarksTree()
+  }
+
   async onSyncStart(needLock = true, forceLock = false) {
     Logger.log('onSyncStart: begin')
 

src/lib/adapters/WebDav.ts

@@ -15,6 +15,7 @@ import {
 import { CapacitorHttp as Http } from '@capacitor/core'
 import { Capacitor } from '@capacitor/core'
 import Html from '../serializers/Html'
+import { Folder, TItemLocation } from '../Tree'
 
 const LOCK_INTERVAL = 2 * 60 * 1000 // Lock every 2mins while syncing
 const LOCK_TIMEOUT = 15 * 60 * 1000 // Override lock 0.25h after last time lock has been set
@@ -284,6 +285,13 @@ export default class WebDavAdapter extends CachingAdapter {
     return response
   }
 
+  async getBookmarksTree(): Promise<Folder<TItemLocation>> {
+    // setHashSettings is called after onSyncStart only but before getBookmarksTree
+    // thus we get the hash here again
+    this.initialTreeHash = await this.bookmarksCache.hash(this.hashSettings)
+    return super.getBookmarksTree()
+  }
+
   async onSyncStart(needLock = true, forceLock = false) {
     Logger.log('onSyncStart: begin')
     this.ended = false