Merge pull request #127 from tosdr/openSettings

Stop auto-opening settings on browser update

Author: shadowwwind

src/manifest-ff.json

@@ -2,7 +2,7 @@
     "manifest_version": 3,
     "name": "__MSG_extensionName__",
     "description": "__MSG_extensionDescription__",
-    "version": "6.0.0",
+    "version": "6.0.1",
     "homepage_url": "https://tosdr.org",
     "permissions": ["tabs", "storage"],
     "background": {

src/manifest.json

@@ -2,7 +2,7 @@
     "manifest_version": 3,
     "name": "__MSG_extensionName__",
     "description": "__MSG_extensionDescription__",
-    "version": "6.0.0",
+    "version": "6.0.1",
     "homepage_url": "https://tosdr.org",
     "permissions": ["tabs", "storage"],
     "background": {

src/scripts/background.ts

@@ -21,8 +21,8 @@ chrome.tabs.onActivated.addListener((activeInfo) => {
     });
 });
 
-chrome.runtime.onInstalled.addListener(() => {
-    void handleExtensionInstalled();
+chrome.runtime.onInstalled.addListener((reason) => {
+    void handleExtensionInstalled(reason);
 });
 
 chrome.runtime.onStartup.addListener(() => {

src/scripts/background/database.ts

@@ -35,7 +35,7 @@ export async function downloadDatabase(apiUrl?: string): Promise<void> {
     }
 }
 
-export async function checkIfUpdateNeeded(firstStart = false): Promise<void> {
+export async function checkIfUpdateNeeded(firstStart = false, addonInstallReason?:chrome.runtime.InstalledDetails): Promise<void> {
     const data = await getLocal([
         'db',
         'lastModified',
@@ -62,7 +62,7 @@ export async function checkIfUpdateNeeded(firstStart = false): Promise<void> {
 
     await downloadDatabase(api);
 
-    if (firstStart) {
+    if (firstStart && addonInstallReason && ["update", "install"].includes(addonInstallReason?.reason)) {
         chrome.runtime.openOptionsPage();
     }
 }

src/scripts/background/install.ts

@@ -3,7 +3,7 @@ import { checkIfUpdateNeeded } from './database';
 import { donationReminderAllowed } from './donation';
 import { initializePageAction } from './pageAction';
 
-export async function handleExtensionInstalled(): Promise<void> {
+export async function handleExtensionInstalled(reason:chrome.runtime.InstalledDetails): Promise<void> {
     const donationAllowed = donationReminderAllowed(navigator.userAgent);
 
     await setLocal({
@@ -15,7 +15,7 @@ export async function handleExtensionInstalled(): Promise<void> {
         },
     });
 
-    await checkIfUpdateNeeded(true);
+    await checkIfUpdateNeeded(true, reason);
 
     const [activeTab] = await queryActiveTab();
     if (activeTab) {

src/views/popup.html

@@ -105,7 +105,7 @@ <h3 style="display: none">
         <a>
             <button id="toggleButton">Toggle Darkmode</button> -
             <button id="settingsButton">Settings</button> -
-            <button id="sourceButton">Source Code</button> - v6.0.0
+            <button id="sourceButton">Source Code</button> - v6.0.1
         </a>
         <p id="translationWarning" class="translationWarning" style="display: none">
             Translations are machine translated. You can turn them off in Settings by choosing English.