Remove the intercept flag

background/detect.js

@@ -34,7 +34,7 @@ md.detect = ({storage: {state}, inject}) => {
         }
 
         if (header(win.header) || match(win.url)) {
-          if (onwakeup && state.intercept) {
+          if (onwakeup && chrome.webRequest) {
             onwakeup = false
             chrome.tabs.reload(id)
           }

background/headers.js

@@ -39,7 +39,9 @@ md.headers = ({storage: {state}, detect}) => {
   var options = ['blocking', 'responseHeaders']
 
   var add = () => {
-    chrome.webRequest.onHeadersReceived.addListener(callback, filter, options)
+    if (!chrome.webRequest.onHeadersReceived.hasListeners()) {
+      chrome.webRequest.onHeadersReceived.addListener(callback, filter, options)
+    }
   }
 
   var remove = () => {

background/messages.js

@@ -78,7 +78,6 @@ md.messages = ({storage: {defaults, state, set}, compilers, mathjax, headers}) =
       sendResponse({
         origins: state.origins,
         header: state.header,
-        intercept: state.intercept,
         match: state.match,
       })
     }
@@ -89,11 +88,8 @@ md.messages = ({storage: {defaults, state, set}, compilers, mathjax, headers}) =
     else if (req.message === 'options.intercept') {
       // ff: onHeadersReceived is enabled by default
       if (!/Firefox/.test(navigator.userAgent)) {
-        if (req.intercept !== state.intercept) {
-          headers[req.intercept ? 'add' : 'remove']()
-        }
+        headers[req.intercept ? 'add' : 'remove']()
       }
-      set({intercept: req.intercept})
       sendResponse()
     }
 

background/storage.js

@@ -16,7 +16,6 @@ md.storage = ({compilers}) => {
     },
     raw: false,
     header: true,
-    intercept: false,
     match,
     origins: {
       'file://': {
@@ -83,10 +82,6 @@ md.storage = ({compilers}) => {
     if (options.content.mathjax === undefined) {
       options.content.mathjax = false
     }
-    // v3.3 -> v3.4
-    if (options.csp === undefined) {
-      options.csp = false
-    }
     // v3.4 -> v3.5
     if (typeof options.origins['file://'] === 'string') {
       options.origins = Object.keys(options.origins)
@@ -97,7 +92,6 @@ md.storage = ({compilers}) => {
       }, all), {})
     }
     if (typeof options.csp === 'boolean') {
-      options.intercept = options.csp
       delete options.csp
     }
 

content/options.js

@@ -3,7 +3,6 @@ var defaults = {
   // storage
   origins: {},
   header: false,
-  intercept: false,
   // static
   protocols: ['https', 'http', '*'],
   // UI
@@ -112,10 +111,7 @@ var events = {
         origin,
         options: {match, csp, encoding},
       })
-      webRequest.update()
-      webRequest.permission(() => {
-        webRequest.register()
-      })
+      webRequest()
     },
 
     encoding: (origin) => (e) => {
@@ -126,41 +122,33 @@ var events = {
         origin,
         options: {match, csp, encoding},
       })
-      webRequest.update()
-      webRequest.permission(() => {
-        webRequest.register()
-      })
+      webRequest()
     },
   },
 }
 
-var webRequest = {
-  update: () => {
-    state.intercept = false
-    for (var key in state.origins) {
-      if (state.origins[key].csp || state.origins[key].encoding) {
-        state.intercept = true
-        break
-      }
-    }
-  },
-  permission: (done) => {
-    // ff: webRequest is required permission
-    if (/Firefox/.test(navigator.userAgent)) {
-      done()
-    }
-    else {
-      chrome.permissions[state.intercept ? 'request' : 'remove']({
-        permissions: ['webRequest', 'webRequestBlocking']
-      }, done)
+function webRequest () {
+  // ff: webRequest is required permission
+  if (/Firefox/.test(navigator.userAgent)) {
+    return
+  }
+
+  var intercept = false
+  for (var key in state.origins) {
+    if (state.origins[key].csp || state.origins[key].encoding) {
+      intercept = true
+      break
     }
-  },
-  register: () => {
+  }
+
+  chrome.permissions[intercept ? 'request' : 'remove']({
+    permissions: ['webRequest', 'webRequestBlocking']
+  }, () => {
     chrome.runtime.sendMessage({
       message: 'options.intercept',
-      intercept: state.intercept,
+      intercept,
     })
-  }
+  })
 }
 
 chrome.extension.isAllowedFileSchemeAccess((isAllowedAccess) => {