ActivityWatch · ErikBjare · Jan 18, 2023 · Jan 10, 2023 · Jan 10, 2023 · Jan 10, 2023
diff --git a/manifest.json b/manifest.json
@@ -22,6 +22,7 @@
 
   "background": {
     "scripts": [
+        "static/installed.js",
         "out/app.js"
     ],
     "persistent": false

diff --git a/src/eventPage.js b/src/eventPage.js
@@ -148,10 +148,40 @@ function popupRequestReceived(msg) {
   }
 }
 
+async function askConsentNeeded() {
+  // Source for compatibility check: https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/Build_a_cross_browser_extension#handling_api_differences
+  try {
+    if (typeof browser.runtime.getBrowserInfo != "function") {
+      return false
+    }
+  } catch (e) {
+    return false
+  }
+  let browserInfo;
+  await browser.runtime.getBrowserInfo().then((info) => {browserInfo = info})
+  if (browserInfo.name != "Firefox") {
+    return false
+  }
+  return true
+}
+
 function startPopupListener() {
-  chrome.storage.local.get(["enabled"], function(obj) {
+  chrome.storage.local.get(["enabled"], async function(obj) {
     if (obj.enabled == undefined) {
-      chrome.storage.local.set({"enabled": true});
+      if(await askConsentNeeded()) {
+        chrome.storage.local.set({"enabled": false}); // TODO: replace with storage.managed
+        chrome.storage.local.set({"noConsentGiven": true});
+        chrome.storage.local.get("askConsent", (obj) => {
+          if(obj.askConsent) {
+            const url = chrome.runtime.getURL("../static/consent.html");
+            chrome.windows.create({ url, type: "popup", height: 420, width: 416, });
+            freshInstall = false;
+          }
+        })
+      } else {
+        chrome.storage.local.set({"enabled": true});
+        startWatcher();
+      }
     }
   });
   chrome.runtime.onMessage.addListener(popupRequestReceived);
@@ -163,5 +193,5 @@ function startPopupListener() {
 
 (function() {
   startPopupListener();
-  startWatcher();
+  // startWatcher() moved to startPopupListener
 })();
diff --git a/static/consent.html b/static/consent.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <title>ActivityWatch Consent Dialog</title>
+
+  <link href="./style.css" rel="stylesheet" type="text/css">
+
+  <script src="./consent.js"></script>
+</head>
+
+<body class="consent">
+  <img src="/media/banners/banner.png" style="width: 100%">
+
+  <hr>
+
+  <h1>Privacy Notice</h1>
+  <p>
+    This extension by nature collects personal identifiable information in the form of URLs. All collected information never leaves your device because all data is only forwarded to localhost. Since this is the core functionality of this extension, the only option to not consent, is to uninstall.
+  </p>
+  <div class="action-container">
+    <div class="action"><button class="button" id="consent-refused">Close Window</button></div>
+    <div class="action"><button class="button accept" id="consent-given">Consent to offline data collection</button></div>
+  </div>
+
+</body>
+
+</html>
diff --git a/static/consent.js b/static/consent.js
@@ -0,0 +1,18 @@
+"use strict";
+
+function consentListeners() {
+  let consent_refused = document.getElementById('consent-refused');
+  let consent_given = document.getElementById('consent-given');
+  consent_refused.addEventListener("click", (obj) => {
+    window.close()
+  });
+  consent_given.addEventListener("click", (obj) => {
+    chrome.runtime.sendMessage({enabled: true}, function(response) {});
+    chrome.storage.local.set({"noConsentGiven": false});
+    window.close()
+  })
+}
+
+document.addEventListener('DOMContentLoaded', function() {
+  consentListeners();
+})
diff --git a/static/installed.js b/static/installed.js
@@ -0,0 +1,11 @@
+"use strict";
+
+chrome.runtime.onInstalled.addListener(async ({ reason, temporary }) => {
+  switch (reason) {
+    case "install":
+      {
+        chrome.storage.local.set({"askConsent": true});
+      }
+      break;
+  }
+});
diff --git a/static/popup.html b/static/popup.html
@@ -39,6 +39,9 @@
           <!-- Filled by JS -->
         </input>
       </td>
+      <td>
+        <button id="status-consent-btn">Consent to Privacy Notice</button>
+      </td>
     </tr>
 
     <tr>

diff --git a/static/popup.js b/static/popup.js
@@ -3,7 +3,21 @@
 function renderStatus() {
   chrome.storage.local.get(["lastSync", "lastSyncSuccess", "testing", "baseURL", "enabled"], function(obj) {
     // Enabled checkbox
-    document.getElementById('status-enabled-checkbox').checked = obj.enabled;
+    let enabledCheckbox = document.getElementById('status-enabled-checkbox');
+    enabledCheckbox.checked = obj.enabled;
+
+    // Consent Button
+    let showConsentBtn = document.getElementById('status-consent-btn');
+    chrome.storage.local.get("noConsentGiven", (obj) => {
+      console.log('noConsentGiven: ', obj.noConsentGiven)
+      if (obj.noConsentGiven) {
+        enabledCheckbox.setAttribute('disabled', '');
+        showConsentBtn.style.display = 'inline-block';
+      } else {
+        enabledCheckbox.removeAttribute('disabled');
+        showConsentBtn.style.display = 'none';
+      }
+    })
 
     // Connected
     let connectedColor = obj.lastSyncSuccess ? "#00AA00" : "#FF0000";
@@ -34,6 +48,11 @@ function domListeners() {
     let enabled = obj.srcElement.checked;
     chrome.runtime.sendMessage({enabled: enabled}, function(response) {});
   });
+  let consent_button = document.getElementById('status-consent-btn');
+  consent_button.addEventListener('click', () => {
+    const url = chrome.runtime.getURL("../static/consent.html");
+    chrome.windows.create({ url, type: "popup", height: 420, width: 416, });
+  });
 }
 
 document.addEventListener('DOMContentLoaded', function() {

diff --git a/static/style.css b/static/style.css
@@ -4,6 +4,10 @@ body {
   width: 25em;
 }
 
+.consent {
+  width: 400px;
+}
+
 hr {
   border: 1px solid #DDD;
 }
@@ -12,6 +16,15 @@ a {
   text-decoration: none;
 }
 
+h1 {
+  margin-bottom: 0px;
+}
+
+button {
+  cursor: pointer;
+  font-size: 100%;
+}
+
 .button {
   display: inline-block;
   color: #333333;
@@ -22,10 +35,28 @@ a {
   border: 1px solid #DDD;
 }
 
+#status-consent-btn {
+  display: none;
+}
+
+.accept {
+  color: #FFF;
+  background-color: #007ef8;
+  border: 1px solid #0073e6;
+}
+
 #status {
   /* avoid an excessively wide status text */
   white-space: pre;
   text-overflow: ellipsis;
   overflow: hidden;
   max-width: 400px;
 }
+
+.action-container {
+  display: flex;
+}
+
+/* .action {
+  flex: 1;
+} */
-Original file line number
+Diff line change
@@ Expand Up / @@ -39,6 +39,9 @@ @@
               <!-- Filled by JS -->
             </input>
           </td>
+          <td>
+            <button id="status-consent-btn">Consent to Privacy Notice</button>
+          </td>
         </tr>
         <tr>
@@ Expand Down @@