Don't reset activation due to slow loading Firefox sync

ajayyy · Aug 31, 2023 · 906c229 · 906c229
1 parent 2a5f13b
commit 906c229
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/src/background.ts b/src/background.ts
@@ -15,6 +15,13 @@ setupTabUpdates(Config);
 setupBackgroundRequestProxy();
 
 waitFor(() => Config.isReady()).then(() => {
+    if (!Config.config!.activated && (Config.config!.alreadyActivated || Config.config!.licenseKey)) {
+        Config.config!.activated = true;
+    }
+    if (Config.config!.activated && Config.config!.userID) {
+        Config.config!.alreadyActivated = true;
+    }
+
     registerNeededContentScripts().then(() => {
         if (!isFirefoxOrSafari()) {
             // Chrome doesn't trigger onInstall when this happens, but they need to be
@@ -29,7 +36,6 @@ waitFor(() => Config.isReady()).then(() => {
         }
     }).catch(logError);
 
-
     setupAlarms();
 
     // Check every time since sometimes initial onInstall isn't called
@@ -44,7 +50,8 @@ waitFor(() => Config.isReady()).then(() => {
                     && !navigator.userAgent.includes("Mobile;")
                     && await isPaywallEnabled()
                     && !groupPolicyLicenseKey
-                    && !Config.config!.licenseKey;
+                    && !Config.config!.licenseKey
+                    && !Config.config!.alreadyActivated;
                 if (paywallEnabled) {
                     Config.config!.activated = false;
                     Config.config!.showActivatedMessage = true;

diff --git a/src/config/config.ts b/src/config/config.ts
@@ -96,6 +96,7 @@ interface SBConfig {
     thumbnailReplacements: number;
     licenseKey: string | null;
     activated: boolean;
+    alreadyActivated: boolean;
     freeActivation: boolean;
     freeTrialStart: number | null;
     freeTrialEnded: boolean;
@@ -169,6 +170,7 @@ const syncDefaults = {
     thumbnailReplacements: 0,
     licenseKey: null,
     activated: true,
+    alreadyActivated: false,
     freeActivation: true,
     freeTrialStart: null,
     freeTrialEnded: false,

diff --git a/src/help/PaymentComponent.tsx b/src/help/PaymentComponent.tsx
@@ -24,6 +24,15 @@ waitFor(() => Config.isReady()).then(() => {
     }
 });
 
+Config.configSyncListeners.push((changes) => {
+    if ((changes.activated && changes.activated.newValue)
+        || (changes.alreadyActivated && changes.alreadyActivated.newValue)) {
+        Config.config!.activated = true;
+
+        chrome.runtime.sendMessage({ "message": "openHelp" }, () => window.close());
+    }
+});
+
 export const PaymentComponent = () => {
     const [paymentResult, setPaymentResult] = React.useState<PaymentResultMessageType | null>(isFreeAccessRequestActive() 
         ? PaymentResultMessageType.FreeAccess : (freeTrialActive() ? PaymentResultMessageType.FreeTrial : null));