Fix error after saving inactivity interval

Author: Stigmatoz

src/components/GeneralSettings.vue

@@ -6,7 +6,7 @@
         class="filled-in"
         id="viewTimeInBadge"
         v-model="viewTimeInBadge"
-        @change="onChange(StorageParams.VIEW_TIME_IN_BADGE, $event.target.checked)"
+        @change="onChange(StorageParams.VIEW_TIME_IN_BADGE, $event.target)"
       />
       <span>Display time tracker in icon</span>
       <p class="description">
@@ -21,7 +21,7 @@
         class="filled-in"
         id="blockDeferral"
         v-model="allowDeferringBlock"
-        @change="onChange(StorageParams.BLOCK_DEFERRAL, $event.target.checked)"
+        @change="onChange(StorageParams.BLOCK_DEFERRAL, $event.target)"
       />
       <span>Allow deferring block for 5 minutes</span>
       <p class="description">
@@ -36,7 +36,7 @@
         class="filled-in"
         id="darkMode"
         v-model="darkMode"
-        @change="onChange(StorageParams.DARK_MODE, $event.target.checked)"
+        @change="onChange(StorageParams.DARK_MODE, $event.target)"
       />
       <span>Dark mode</span>
       <p class="description">Dark theme</p>
@@ -50,7 +50,7 @@
       <select
         class="option"
         v-model="intervalInactivity"
-        @change="onChange(StorageParams.INTERVAL_INACTIVITY, $event.target.value)"
+        @change="onChange(StorageParams.INTERVAL_INACTIVITY, $event.target)"
       >
         <option :value="InactivityInterval.Seconds_30">30 seconds</option>
         <option :value="InactivityInterval.Seconds_45">45 seconds</option>
@@ -135,8 +135,12 @@ onMounted(async () => {
   selectedDate.value = ThisWeekRange;
 });
 
-async function onChange(storageParam: StorageParams, value: any) {
-  await save(storageParam, value);
+async function onChange(storageParam: StorageParams, target: any) {
+  if (target != null)
+    await save(
+      storageParam,
+      storageParam == StorageParams.INTERVAL_INACTIVITY ? Number(target.value) : target.checked,
+    );
 }
 
 async function save(storageParam: StorageParams, value: any) {

src/components/WhiteList.vue

@@ -64,18 +64,14 @@ function addToWhiteList() {
   } else {
     const newWebsite = extractHostname(newWebsiteForWhiteList.value!);
     whiteList.value?.push(newWebsite);
-    onChange(StorageParams.BLACK_LIST, whiteList.value);
+    save(StorageParams.BLACK_LIST, whiteList.value);
     newWebsiteForWhiteList.value = '';
   }
 }
 
 function deleteFromWhiteList(url: string) {
   whiteList.value = whiteList.value!.filter(x => x != url);
-  onChange(StorageParams.BLACK_LIST, whiteList.value);
-}
-
-async function onChange(storageParam: StorageParams, value: any) {
-  await save(storageParam, value);
+  save(StorageParams.BLACK_LIST, whiteList.value);
 }
 
 async function save(storageParam: StorageParams, value: any) {

src/tracker.ts

@@ -37,22 +37,22 @@ async function trackTime() {
     if (isValidPage(activeTab)) {
       const activeDomain = extractHostname(activeTab!.url);
 
-      if (
-        currentObj != null &&
-        currentObj.activeDomain == activeDomain &&
-        !isActiveTabWasChanged(activeDomain)
-      ) {
-        await mainTrackerWrapper(activeTab!, activeDomain, currentObj.tab);
-        return;
-      }
-
       if (await isInBlackList(activeDomain)) {
         useBadge({
           tabId: activeTab!.id!,
           text: 'n/a',
           color: BadgeColor.green,
         });
       } else {
+        if (
+          currentObj != null &&
+          currentObj.activeDomain == activeDomain &&
+          !isActiveTabWasChanged(activeDomain)
+        ) {
+          await mainTrackerWrapper(activeTab!, activeDomain, currentObj.tab);
+          return;
+        }
+
         let tab = repo.getTab(activeDomain);
         if (tab == undefined) {
           tab = await repo.addTab(activeDomain, activeTab?.favIconUrl);
@@ -122,9 +122,9 @@ async function mainTracker(
 }
 
 async function mainTrackerWrapper(activeTab: Browser.Tabs.Tab, activeDomain: string, tab: Tab) {
-  const inactivityInterval = await Settings.getInstance().getSetting(
+  const inactivityInterval = (await Settings.getInstance().getSetting(
     StorageParams.INTERVAL_INACTIVITY,
-  );
+  )) as number;
   const state = await Browser.idle.queryState(inactivityInterval);
   await mainTracker(state, activeTab!, activeDomain, tab);
 }