Gildas 2 лет назад
Родитель
Сommit
3e8bcec1f9
1 измененных файлов с 5 добавлено и 5 удалено
  1. 5 5
      src/core/bg/config.js

+ 5 - 5
src/core/bg/config.js

@@ -190,7 +190,7 @@ export {
 	removeAuthInfo
 };
 
-async function upgrade(ignoreOldProfiles) {
+async function upgrade() {
 	const { sync } = await browser.storage.local.get();
 	if (sync) {
 		configStorage = browser.storage.sync;
@@ -199,16 +199,16 @@ async function upgrade(ignoreOldProfiles) {
 	}
 	const config = await configStorage.get();
 	if (!config[PROFILE_NAME_PREFIX + DEFAULT_PROFILE_NAME]) {
-		if (config.profiles && !ignoreOldProfiles) {
+		if (config.profiles) {
 			const profileNames = Object.keys(config.profiles);
 			for (const profileName of profileNames) {
 				await setProfile(profileName, config.profiles[profileName]);
 			}
-			// uncomment when migration is done
-			// await configStorage.remove(["profiles"]);
 		} else {
 			await setProfile(DEFAULT_PROFILE_NAME, DEFAULT_CONFIG);
 		}
+	} else if (config.profiles) {
+		await configStorage.remove(["profiles"]);
 	}
 	if (!config.rules) {
 		await configStorage.set({ rules: DEFAULT_RULES });
@@ -538,7 +538,7 @@ async function resetProfiles() {
 	await tabsData.set(allTabsData);
 	let profileKeyNames = await getProfileKeyNames();
 	await configStorage.remove([...profileKeyNames, "rules", "maxParallelWorkers", "processInForeground"]);
-	await upgrade(true);
+	await upgrade();
 }
 
 async function resetProfile(profileName) {