Only show welcome screen on new profile installs (#785)

greatsuspender · Oct 11, 2018 · e339c8d · e339c8d
1 parent 1cb3842
commit e339c8d
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 6 deletions.
diff --git a/src/js/gsSession.js b/src/js/gsSession.js
@@ -8,7 +8,7 @@ var gsSession = (function() {
   const updateUrl = chrome.extension.getURL('update.html');
   const updatedUrl = chrome.extension.getURL('updated.html');
 
-  let initialisationMode = false;
+  let initialisationMode = true;
   let initPeriodInSeconds;
   let initTimeoutInSeconds;
   let sessionId;
@@ -20,6 +20,7 @@ var gsSession = (function() {
   let startupRecoveryTimeTakenInSeconds;
   let startupType;
   let startupLastVersion;
+  let syncedSettingsOnInit;
 
   function initAsPromised() {
     return new Promise(async function(resolve) {
@@ -126,6 +127,10 @@ var gsSession = (function() {
     return updateType;
   }
 
+  function setSynchedSettingsOnInit(syncedSettings) {
+    syncedSettingsOnInit = syncedSettings;
+  }
+
   async function runStartupChecks() {
     initialisationMode = true;
     const currentSessionTabs = await gsChrome.tabsQuery();
@@ -182,9 +187,14 @@ var gsSession = (function() {
   async function handleNewInstall(curVersion) {
     gsStorage.setLastVersion(curVersion);
 
-    //show welcome message
-    const optionsUrl = chrome.extension.getURL('options.html?firstTime');
-    await gsChrome.tabsCreate(optionsUrl);
+    // Try to determine if this is a new install for the computer or for the whole profile
+    // If settings sync contains non-default options, then we can assume it's only
+    // a new install for this computer
+    if (!syncedSettingsOnInit || Object.keys(syncedSettingsOnInit).length === 0) {
+      //show welcome message
+      const optionsUrl = chrome.extension.getURL('options.html?firstTime');
+      await gsChrome.tabsCreate(optionsUrl);
+    }
   }
 
   async function handleUpdate(currentSessionTabs, curVersion, lastVersion) {
@@ -970,6 +980,7 @@ var gsSession = (function() {
     getTabCheckTimeTakenInSeconds,
     getRecoveryTimeTakenInSeconds,
     getStartupType,
+    setSynchedSettingsOnInit,
     getStartupLastVersion,
     recoverLostTabs,
     triggerDiscardOfAllTabs,

diff --git a/src/js/gsStorage.js b/src/js/gsStorage.js
@@ -1,4 +1,4 @@
-/*global chrome, gsAnalytics, localStorage, gsUtils */
+/*global chrome, gsAnalytics, gsSession, localStorage, gsUtils */
 'use strict';
 
 var gsStorage = {
@@ -72,6 +72,7 @@ var gsStorage = {
       var defaultKeys = Object.keys(defaultSettings);
       chrome.storage.sync.get(defaultKeys, function(syncedSettings) {
         gsUtils.log('gsStorage', 'syncedSettings on init: ', syncedSettings);
+        gsSession.setSynchedSettingsOnInit(syncedSettings);
 
         var rawLocalSettings;
         try {
@@ -293,7 +294,6 @@ var gsStorage = {
       );
     }
   },
-  isNewInstall: function() {},
 
   fetchNoticeVersion: function() {
     var lastNoticeVersion;