fix(WebDAV): Fix includes is not a function error

marcelklehr · marcelklehr · commit 02b7553f1f5e · 2025-01-06T16:53:20.000+01:00
Signed-off-by: Marcel Klehr &lt;mklehr@gmx.net&gt;
diff --git a/src/lib/adapters/WebDav.ts b/src/lib/adapters/WebDav.ts
@@ -221,7 +221,7 @@ export default class WebDavAdapter extends CachingAdapter {
             xmlDocText = await Crypto.decryptAES(this.server.passphrase, xmlDocText, this.server.bookmark_file)
           }
         } catch (e) {
-          if (xmlDocText.includes('<?xml version="1.0" encoding="UTF-8"?>') || xmlDocText.includes('<!DOCTYPE NETSCAPE-Bookmark-file-1>')) {
+          if (xmlDocText && (xmlDocText.includes('<?xml version="1.0" encoding="UTF-8"?>') || xmlDocText.includes('<!DOCTYPE NETSCAPE-Bookmark-file-1>'))) {
             // not encrypted, yet => noop
           } else {
             throw new DecryptionError()

Original file line number	Diff line number	Diff line change
`@@ -221,7 +221,7 @@ export default class WebDavAdapter extends CachingAdapter {`
`221`	`221`	`xmlDocText = await Crypto.decryptAES(this.server.passphrase, xmlDocText, this.server.bookmark_file)`
`222`	`222`	`}`
`223`	`223`	`} catch (e) {`
`224`		`- if (xmlDocText.includes('<?xml version="1.0" encoding="UTF-8"?>') \|\| xmlDocText.includes('<!DOCTYPE NETSCAPE-Bookmark-file-1>')) {`
	`224`	`+ if (xmlDocText && (xmlDocText.includes('<?xml version="1.0" encoding="UTF-8"?>') \|\| xmlDocText.includes('<!DOCTYPE NETSCAPE-Bookmark-file-1>'))) {`
`225`	`225`	`// not encrypted, yet => noop`
`226`	`226`	`} else {`
`227`	`227`	`throw new DecryptionError()`