Merge branch 'develop'

marcelklehr · marcelklehr · commit 74331e14eab7 · 2018-04-02T23:23:26.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## v2.0.4
+ - FIX: getAllAccounts didn't have a fallback for the initial loading of the extension
+
 ## v2.0.3
  - FIX: Display error messages of multiple errors
  - FIX: Add resource locking to fix race conditions and allow more concurrency (should fix remaining issues related to creation of duplicates)
diff --git a/manifest.json b/manifest.json
@@ -2,7 +2,7 @@
   "manifest_version": 2,
   "name": "Floccus (nextcloud Sync)",
   "short_name": "Floccus",
-  "version": "2.0.3",
+  "version": "2.0.4",
   "description": "Sync your browser with nextcloud (currently only bookmarks; more to come)",
   "icons": {
     "48": "icons/logo.png"
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "floccus",
-  "version": "2.0.3",
+  "version": "2.0.4",
   "description": "The goal of this project is to build a browser extension that syncs your browser data with [OwnCloud](http://owncloud.org).",
   "main": "index.js",
   "scripts": {
diff --git a/src/lib/Account.js b/src/lib/Account.js
@@ -258,7 +258,7 @@ export default class Account {
   }
 
   static async getAllAccounts () {
-    const d = await browser.storage.local.get('accounts')
+    const d = await browser.storage.local.get({'accounts': {}})
     var accounts = d['accounts']
 
     accounts = await Promise.all(

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "floccus",`
`3`		`- "version": "2.0.3",`
	`3`	`+ "version": "2.0.4",`
`4`	`4`	`"description": "The goal of this project is to build a browser extension that syncs your browser data with [OwnCloud](http://owncloud.org).",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -258,7 +258,7 @@ export default class Account {`
`258`	`258`	`}`
`259`	`259`
`260`	`260`	`static async getAllAccounts () {`
`261`		`- const d = await browser.storage.local.get('accounts')`
	`261`	`+ const d = await browser.storage.local.get({'accounts': {}})`
`262`	`262`	`var accounts = d['accounts']`
`263`	`263`
`264`	`264`	`accounts = await Promise.all(`