Prepare fix for debug value defaults for Firefox and Safari, update v…

…ersion to 1.0.8
cavi-au · Jun 28, 2022 · c49990e · c49990e
1 parent c007f24
commit c49990e
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 25 deletions.
diff --git a/Extension/Action.js b/Extension/Action.js
@@ -50,7 +50,7 @@ class Action {
         if (this.config.timeout != null) {
             return this.config.timeout;
         } else {
-            let pipEnabled = ConsentEngine.debugValues.skipHideMethod === false && ConsentEngine.debugValues.hideInsteadOfPIP === false;
+            let pipEnabled = !(ConsentEngine.debugValues.skipHideMethod || ConsentEngine.debugValues.hideInsteadOfPIP);
 
             if (ConsentEngine.debugValues.clickDelay) {
                 return 125;
@@ -437,7 +437,7 @@ class HideAction extends Action {
     }
 
     async execute(param) {
-        if(ConsentEngine.debugValues.skipHideMethod === true) {
+        if(ConsentEngine.debugValues.skipHideMethod) {
             return;
         }
 

diff --git a/Extension/ConsentEngine.js b/Extension/ConsentEngine.js
@@ -150,7 +150,7 @@ class ConsentEngine {
                                 console.groupEnd();
                             }
                             if (!ConsentEngine.debugValues.skipHideMethod) {
-                                if(ConsentEngine.debugValues.dontHideProgressDialog === false) {
+                                if(!ConsentEngine.debugValues.dontHideProgressDialog) {
                                     cmp.stopObservers();
                                 }
                             }
@@ -234,7 +234,7 @@ class ConsentEngine {
                                 console.log("Error during consent handling:", e);
                             }
                             if (!ConsentEngine.debugValues.skipHideMethod) {
-                                if(ConsentEngine.debugValues.dontHideProgressDialog === false) {
+                                if(!ConsentEngine.debugValues.dontHideProgressDialog) {
                                     self.currentCMP = null;
                                     cmp.stopObservers();
                                     cmp.unHideAll();

diff --git a/Extension/GDPRConfig.js b/Extension/GDPRConfig.js
@@ -35,7 +35,7 @@ class GDPRConfig {
     static getDebugValues() {
         return new Promise((resolve, reject) => {
             chrome.storage.sync.get({
-                debugFlags: GDPRConfig.defaultDebugFlags
+                debugFlags: {}
             }, (result) => {
                 resolve(result.debugFlags);
             });
@@ -254,8 +254,6 @@ class GDPRConfig {
 
     static setDebugFlags(newDebugFlags) {
         return new Promise((resolve, reject)=>{
-            newDebugFlags = Object.assign({}, GDPRConfig.defaultDebugFlags, newDebugFlags);
-
             chrome.storage.sync.set({
                 debugFlags: newDebugFlags
             }, () => {
@@ -287,18 +285,3 @@ GDPRConfig.defaultValues = {
 GDPRConfig.defaultRuleLists = [
     "https://raw.githubusercontent.com/cavi-au/Consent-O-Matic/master/rules-list.json",
 ];
-
-
-GDPRConfig.defaultDebugFlags = {
-    "clickDelay": false,
-    "skipSubmit": false,
-    "paintMatchers": false,
-    "debugClicks": false,
-    "alwaysForceRulesUpdate": false,
-    "skipHideMethod": false,
-    "debugLog": false,
-    "debugTranslations": false,
-    "skipSubmitConfirmation": false,
-    "hideInsteadOfPIP": false,
-    "dontHideProgressDialog": false
-}
diff --git a/Extension/language.js b/Extension/language.js
@@ -1162,7 +1162,7 @@ class Language {
             } else {
                 console.warn("Missing translation ["+lang+"] for key: ", key, translation);
 
-                if(Language.debugTranslations !== true) {
+                if(!Language.debugTranslations) {
                     if(translation["en"] != null) {
                         result = translation["en"];
                     }

diff --git a/Extension/manifest.json b/Extension/manifest.json
@@ -3,7 +3,7 @@
 	"description": "Automatic handling of GDPR consent forms",
 	"author": "CAVI - Aarhus University",
 	"homepage_url": "https://github.com/cavi-au/Consent-O-Matic",
-	"version": "1.0.5",
+	"version": "1.0.8",
 	"manifest_version": 2,
 	"permissions": [
 		"activeTab",

diff --git a/Extension/options.js b/Extension/options.js
@@ -61,7 +61,7 @@ GDPRConfig.getDebugFlags().then((debugFlags) => {
 	console.log("Nuking values");
 	chrome.storage.sync.remove("debugFlags", ()=>{
 		chrome.storage.sync.set({
-    	            debugFlags: {ost:true}
+    	            debugFlags: {}
 	        });
         	setTimeout(async ()=>{
         		let values = await GDPRConfig.getDebugValues();