1.3.2: fix a sync bug

fix: make conflict if local is not empty after login

CHANGELOG.md

@@ -1,3 +1,9 @@
+### v1.3.2 9/5/2018
+
+ - pref: use vuex store options and login status
+ - feat: add an option to alert before removing list
+ - fix: make conflict if local is not empty after login (avoid directly downloading if local is not empty)
+
 ### v1.3.1 9/2/2018
 
  - feat: add an option to allow using night mode by default

src/manifest.json

@@ -1,7 +1,7 @@
 {
   "manifest_version": 2,
   "name": "__MSG_ext_name__",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "default_locale": "en",
   "description": "__MSG_ext_desc__",
   "author": "WangJie <[email protected]>",

src/page/SyncInfo.vue

@@ -168,6 +168,7 @@
 </template>
 
 <script>
+import _ from 'lodash'
 import __ from '@/common/i18n'
 import {formatTime, one} from '@/common/utils'
 import boss from '@/common/service/boss'
@@ -237,7 +238,11 @@ export default {
       this.bossinfo = await boss.getInfo()
       await browser.storage.local.set({sync_info: this.bossinfo})
       await this.loadSyncInfo()
-      chrome.runtime.sendMessage({forceDownload: true})
+      const localInfo = await browser.storage.local.get(['listsUpdatedAt', 'optsUpdatedAt'])
+      const {lists} = await browser.storage.local.get(['lists'])
+      // if never uploaded but there are lists in the local making a conflict first
+      if (_.isEmpty(localInfo) && !_.isEmpty(lists)) chrome.runtime.sendMessage({uploadImmediate: true})
+      else chrome.runtime.sendMessage({forceDownload: true})
     },
     async resolveConflict(type, result) {
       chrome.runtime.sendMessage({resolveConflict: {type, result}})