Synchronize settings via Firefox Sync

2 files changed, 19 insertions, 7 deletions

diff --git a/src/settings/actions/setting.ts b/src/settings/actions/setting.ts
index 589ec36..93ca5f8 100644
--- a/src/settings/actions/setting.ts
+++ b/src/settings/actions/setting.ts
@@ -26,6 +26,7 @@ const save = async(data: SettingData): Promise<actions.SettingAction> => {
   return set(data);
 };
 
+
 const switchToForm = (json: JSONTextSettings): actions.SettingAction => {
   try {
     // toSettings exercise validation
diff --git a/src/settings/storage.ts b/src/settings/storage.ts
index f375e58..55cca96 100644
--- a/src/settings/storage.ts
+++ b/src/settings/storage.ts
@@ -1,20 +1,31 @@
 import SettingData, { DefaultSettingData } from '../shared/SettingData';
 
-export const load = async(): Promise<SettingData> => {
-  const { settings } = await browser.storage.local.get('settings');
-  if (!settings) {
-    return DefaultSettingData;
+const loadSettingData = async(): Promise<SettingData> => {
+  const { settings: syncSettings } = await browser.storage.sync.get('settings');
+  if (syncSettings) {
+    return SettingData.fromJSON(syncSettings as any);
   }
+  const { settings: localSettings } = await browser.storage.local.get('settings');
+  if (localSettings) {
+    return SettingData.fromJSON(localSettings as any);
+  }
+  return DefaultSettingData
+};
+
+export const load = async(): Promise<SettingData> => {
   try {
-    return SettingData.fromJSON(settings as any);
+    return loadSettingData();
   } catch (e) {
     console.error('unable to load settings', e);
     return DefaultSettingData;
   }
 };
 
-export const save = (data: SettingData) => {
-  return browser.storage.local.set({
+export const save = async (data: SettingData) => {
+  await browser.storage.local.set({
+    settings: data.toJSON(),
+  });
+  return browser.storage.sync.set({
     settings: data.toJSON(),
   });
 };