Also save account information when selecting folders

Fixes: #1

Author: robert7k

background.js

@@ -8,8 +8,8 @@ async function onCommand(command) {
 		console.log("No folder setting found");
 		return;
 	}
-	const path = setting.folders[folderIndex].value;
-	console.log(`Got saved folder value: ${path}`);
+	const folderSetting = setting.folders[folderIndex].value;
+	console.log(`Got saved folder value: ${folderSetting}`);
 
 	const tabs = await browser.tabs.query({
 		active: true,
@@ -21,18 +21,26 @@ async function onCommand(command) {
 		console.log("No message selected");
 		return;
 	}
-	const folder = await findFolder(path);
+	const folder = await findFolder(folderSetting);
 	if (!folder) {
 		console.log(`Folder ${setting.folder} not found`);
 		return;
 	}
 	await browser.messages.move([message.id], folder);
-	console.log("Success");
 }
 
-async function findFolder(path) {
-	const accounts = await browser.accounts.list();
-	return findSubfolder(path, accounts.flatMap(account => account.folders));
+async function findFolder(folderSetting) {
+	try {
+		const setting = JSON.parse(folderSetting);
+		if (setting.accountId) {
+			const account = await browser.accounts.get(setting.accountId);
+			return findSubfolder(setting.folderPath, account.folders);
+		}
+	} catch (ex) {
+		// Saved with previous version which only contains the folder name
+		const accounts = await browser.accounts.list();
+		return findSubfolder(folderSetting, accounts.flatMap(account => account.folders));
+	}
 }
 
 function findSubfolder(path, list) {

manifest.json

@@ -1,7 +1,7 @@
 {
   "name": "Move Mail Shortcuts",
   "description": "Allows to assign keyboard shortcuts for moving mails to folders.",
-  "version": "1",
+  "version": "2",
   "applications": {
     "gecko": {
       "id": "mailMoveShortcuts@extension",

options.js

@@ -11,16 +11,16 @@ function saveOptions(e) {
 }
 
 function restoreOptions(idx, folderSelect) {
-  function loadFolders(folderList, parent, prefix = "") {
+  function loadFolders(account, folderList, parent, prefix = "") {
 	if (!folderList)
 		return;
 	folderList.forEach(folder => {
 		const f = document.createElement("option");
 		f.appendChild(document.createTextNode(prefix + folder.name));
-		var attr = document.createAttribute("value");
-		attr.value = folder.path;
-		f.setAttributeNode(attr);
-		loadFolders(folder.subFolders, parent, prefix + "\xa0");
+		const valueAttr = document.createAttribute("value");
+		valueAttr.value = JSON.stringify({ folderPath: folder.path, accountId: account.id });
+		f.setAttributeNode(valueAttr);
+		loadFolders(account, folder.subFolders, parent, prefix + "\xa0");
 		parent.appendChild(f);
 	});
   }
@@ -30,7 +30,7 @@ function restoreOptions(idx, folderSelect) {
 		var attr = document.createAttribute("label");
 		attr.value = account.name;
 		a.setAttributeNode(attr);
-		loadFolders(account.folders, a); 
+		loadFolders(account, account.folders, a); 
 		folderSelect.appendChild(a);
 	  });
   }
@@ -39,7 +39,7 @@ function restoreOptions(idx, folderSelect) {
   browser.storage.sync.get("folders")
 	.then(v => {
 		if (v.folders[idx]) {
-			console.log(v);
+			console.log(v.folders[idx]);
 			folderSelect.value = v.folders[idx].value;
 		}
 	} );