Merge pull request #7 from AzlanCoding/bug-fixes

Fixed No Auto Sync After Extension Refresh Due to Permission Changes + Other Minor Bugs

Author: AzlanCoding

extension/background.js

@@ -317,13 +317,14 @@ function fileAccessSchemeExtPageSwitch(){
   fileAccessSchemeExtPage = true;
 }
 async function blockingWindow(url, callback){
+  await logData("info","BlockingWindow Initilising!");
   return chrome.windows.create({
     url: url,
     type: "popup",
     state: "fullscreen"
-  }, callback).then(async() => {
+  }, callback)/*.then(async() => {
     logData("info","BlockingWindow Initilised!");
-  })
+  })*/
 }
 function relaunchEnforceWindow(windowId) {
   let timenow = new Date().getTime();
@@ -558,19 +559,23 @@ async function handleExternalAction(sendResponse, func, args){
 
 
 /*---Main Startup---*/
-function initExtension(){
-  if (typeof syncEnrollmentInterval == 'undefined'){
-    syncEnrollment();
-    let syncEnrollmentInterval = setInterval(syncEnrollment, 30000);
-  }
-  if (typeof syncEnrollmentInterval == 'undefined'){
-    let setBlockedSitesInterval = setBlockedSitesLoop();
-  }
-  if (typeof permissionsCheckInterval == 'undefined'){
-    checkPermissions();
-    let permissionsCheckInterval = setInterval(checkPermissions, 1000);
+async function initExtension(){
+  let startupInfo = chrome.storage.session.get('initStarted')
+  if (typeof startupInfo.initStarted == 'undefined'){
+    await chrome.storage.session.set({initStarted: true})
+    if (typeof syncEnrollmentInterval == 'undefined'){
+      syncEnrollment();
+      let syncEnrollmentInterval = setInterval(syncEnrollment, 30000);
+    }
+    if (typeof syncEnrollmentInterval == 'undefined'){
+      let setBlockedSitesInterval = setBlockedSitesLoop();
+    }
+    if (typeof permissionsCheckInterval == 'undefined'){
+      checkPermissions();
+      let permissionsCheckInterval = setInterval(checkPermissions, 1000);
+    }
+    return logData("info","EXTENSION INITILISATION COMPLETE");
   }
-  return logData("info","EXTENSION INITILISATION COMPLETE");
 }
 
 if (typeof window == 'undefined') { //The javascript equivilant of `if __name__ == '__main__':` in python
@@ -601,4 +606,5 @@ if (typeof window == 'undefined') { //The javascript equivilant of `if __name__
 
   chrome.runtime.onStartup.addListener(initExtension);
   chrome.runtime.onInstalled.addListener(initExtension);
+  initExtension();
 }

extension/manifest.json

@@ -1,7 +1,7 @@
 {
   "manifest_version": 3,
   "name": "Ignite DMA",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "author": "AzlanCoding",
   "description": "A Device Manager Application (DMA) for students under MOE",
   "homepage_url": "https://ignitedma.mooo.com/",

server/assets/service/update.xml

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <gupdate xmlns='http://www.google.com/update2/response' protocol='2.0'>
     <app appid='clhnfaboginbheghbebffggbdnijjika'>
-        <updatecheck codebase='https://ignitedma.mooo.com/assets/service/chrome_extension/v1.1.2.crx' version='1.1.2' />
+        <updatecheck codebase='https://ignitedma.mooo.com/assets/service/chrome_extension/v1.1.3.crx' version='1.1.3' />
 		</app>
 </gupdate>