Bug Fixes

Bug Fixes

app/src/main/AndroidManifest.xml

@@ -220,7 +220,7 @@
             android:stopWithTask="true" />
 
         <service
-            android:name="org.orbotproject.android.service.OrbotService"
+            android:name="org.torproject.android.service.OrbotService"
             android:enabled="true"
             android:exported="false"
             android:stopWithTask="true" />
@@ -242,7 +242,7 @@
         </receiver>
 
         <receiver
-            android:name="org.orbotproject.android.service.StartTorReceiver"
+            android:name="org.torproject.android.service.StartTorReceiver"
             android:exported="true"
             tools:ignore="ExportedReceiver">
             <intent-filter>

app/src/main/assets/geckoview-config-noimage.yaml

@@ -1,56 +1,56 @@
-# Contents of /data/local/tmp/com.yourcompany.yourapp-geckoview-config.yaml
-
-env:
-  MOZ_LOG: nsHttp:5
-
-
-prefs:
-  network.proxy.type:  1
-  # network.proxy.socks:  "127.0.0.1"
-  # network.proxy.socks_port:  9050
-  network.proxy.socks_version:  5
-  network.proxy.socks_remote_dns:  true
-  permissions.default.image:  2
-  browser.display.show_image_placeholders: true
-  browser.cache.disk.enable: false
-  browser.cache.memory.enable: true
-  browser.cache.disk.capacity: 0
-  privacy.resistFingerprinting: true
-  privacy.donottrackheader.enabled: false
-  privacy.donottrackheader.value: 1
-  network.http.sendRefererHeader:  0
-  security.checkloaduri: false
-  security.mixed_content.block_active_content: false
-  security.mixed_content.block_display_content:  false
-  media.peerconnection.enabled: false //webrtc disabled
-  browser.cache.disk_cache_ssl: true
-  signon.formlessCapture.enabled: true
-  signon.storeWhenAutocompleteOff: true
-  dom.event.contextmenu.enabled: true
-  layout.css.visited_links_enabled: true
-  security.ssl3.ecdhe_rsa_aes_128_sha: true
-  security.ssl3.ecdhe_ecdsa_aes_128_sha: true
-  security.ssl3.dhe_rsa_aes_128_sha: true
-  security.ssl3.rsa_des_ede3_sha: true
-  security.ssl3.dhe_rsa_aes_256_sha: true
-  browser.safebrowsing.blockedURIs.enabled: false
-  media.gmp-provider.enabled: false
-  browser.send_pings.require_same_host: false
-  webgl.disabled: false
-  pdfjs.enableWebGL: false
-  browser.safebrowsing.malware.enabled: false
-  security.csp.experimentalEnabled: false
-  network.http.referer.spoofSource: false
-  security.OCSP.require: false
-  security.ssl.require_safe_negotiation: false
-  privacy.clearOnShutdown.cache: true
-  privacy.clearOnShutdown.downloads: true
-  privacy.clearOnShutdown.formdata: true
-  privacy.clearOnShutdown.history: true
-  privacy.clearOnShutdown.offlineApps: true
-  privacy.clearOnShutdown.passwords: true
-  privacy.clearOnShutdown.sessions: true
-  privacy.clearOnShutdown.siteSettings: true
-
-
-
+# Contents of /data/local/tmp/com.yourcompany.yourapp-geckoview-config.yaml
+
+env:
+  MOZ_LOG: nsHttp:5
+
+
+prefs:
+  network.proxy.type:  1
+  # network.proxy.socks:  "127.0.0.1"
+  # network.proxy.socks_port:  9050
+  network.proxy.socks_version:  5
+  network.proxy.socks_remote_dns:  true
+  permissions.default.image:  2
+  browser.display.show_image_placeholders: true
+  browser.cache.disk.enable: false
+  browser.cache.memory.enable: true
+  browser.cache.disk.capacity: 0
+  privacy.resistFingerprinting: true
+  privacy.donottrackheader.enabled: false
+  privacy.donottrackheader.value: 1
+  network.http.sendRefererHeader:  0
+  security.checkloaduri: false
+  security.mixed_content.block_active_content: false
+  security.mixed_content.block_display_content:  false
+  media.peerconnection.enabled: false //webrtc disabled
+  browser.cache.disk_cache_ssl: true
+  signon.formlessCapture.enabled: true
+  signon.storeWhenAutocompleteOff: true
+  dom.event.contextmenu.enabled: true
+  layout.css.visited_links_enabled: true
+  security.ssl3.ecdhe_rsa_aes_128_sha: true
+  security.ssl3.ecdhe_ecdsa_aes_128_sha: true
+  security.ssl3.dhe_rsa_aes_128_sha: true
+  security.ssl3.rsa_des_ede3_sha: true
+  security.ssl3.dhe_rsa_aes_256_sha: true
+  browser.safebrowsing.blockedURIs.enabled: false
+  media.gmp-provider.enabled: false
+  browser.send_pings.require_same_host: false
+  webgl.disabled: false
+  pdfjs.enableWebGL: false
+  browser.safebrowsing.malware.enabled: false
+  security.csp.experimentalEnabled: false
+  network.http.referer.spoofSource: false
+  security.OCSP.require: false
+  security.ssl.require_safe_negotiation: false
+  privacy.clearOnShutdown.cache: true
+  privacy.clearOnShutdown.downloads: true
+  privacy.clearOnShutdown.formdata: true
+  privacy.clearOnShutdown.history: true
+  privacy.clearOnShutdown.offlineApps: true
+  privacy.clearOnShutdown.passwords: true
+  privacy.clearOnShutdown.sessions: true
+  privacy.clearOnShutdown.siteSettings: true
+
+
+

app/src/main/assets/geckoview-config.yaml

@@ -1,56 +1,56 @@
-# Contents of /data/local/tmp/com.yourcompany.yourapp-geckoview-config.yaml
-
-env:
-  MOZ_LOG: nsHttp:5
-
-
-prefs:
-  network.proxy.type:  1
-  # network.proxy.socks:  "127.0.0.1"
-  # network.proxy.socks_port:  9050
-  network.proxy.socks_version:  5
-  network.proxy.socks_remote_dns:  true
-  permissions.default.image:  1
-  browser.display.show_image_placeholders: true
-  browser.cache.disk.enable: false
-  browser.cache.memory.enable: true
-  browser.cache.disk.capacity: 0
-  privacy.resistFingerprinting: true
-  privacy.donottrackheader.enabled: false
-  privacy.donottrackheader.value: 1
-  network.http.sendRefererHeader:  0
-  security.checkloaduri: false
-  security.mixed_content.block_active_content: false
-  security.mixed_content.block_display_content:  false
-  media.peerconnection.enabled: false //webrtc disabled
-  browser.cache.disk_cache_ssl: true
-  signon.formlessCapture.enabled: true
-  signon.storeWhenAutocompleteOff: true
-  dom.event.contextmenu.enabled: true
-  layout.css.visited_links_enabled: true
-  security.ssl3.ecdhe_rsa_aes_128_sha: true
-  security.ssl3.ecdhe_ecdsa_aes_128_sha: true
-  security.ssl3.dhe_rsa_aes_128_sha: true
-  security.ssl3.rsa_des_ede3_sha: true
-  security.ssl3.dhe_rsa_aes_256_sha: true
-  browser.safebrowsing.blockedURIs.enabled: false
-  media.gmp-provider.enabled: false
-  browser.send_pings.require_same_host: false
-  webgl.disabled: false
-  pdfjs.enableWebGL: false
-  browser.safebrowsing.malware.enabled: false
-  security.csp.experimentalEnabled: false
-  network.http.referer.spoofSource: false
-  security.OCSP.require: false
-  security.ssl.require_safe_negotiation: false
-  privacy.clearOnShutdown.cache: true
-  privacy.clearOnShutdown.downloads: true
-  privacy.clearOnShutdown.formdata: true
-  privacy.clearOnShutdown.history: true
-  privacy.clearOnShutdown.offlineApps: true
-  privacy.clearOnShutdown.passwords: true
-  privacy.clearOnShutdown.sessions: true
-  privacy.clearOnShutdown.siteSettings: true
-
-
-
+# Contents of /data/local/tmp/com.yourcompany.yourapp-geckoview-config.yaml
+
+env:
+  MOZ_LOG: nsHttp:5
+
+
+prefs:
+  network.proxy.type:  1
+  # network.proxy.socks:  "127.0.0.1"
+  # network.proxy.socks_port:  9050
+  network.proxy.socks_version:  5
+  network.proxy.socks_remote_dns:  true
+  permissions.default.image:  1
+  browser.display.show_image_placeholders: true
+  browser.cache.disk.enable: false
+  browser.cache.memory.enable: true
+  browser.cache.disk.capacity: 0
+  privacy.resistFingerprinting: true
+  privacy.donottrackheader.enabled: false
+  privacy.donottrackheader.value: 1
+  network.http.sendRefererHeader:  0
+  security.checkloaduri: false
+  security.mixed_content.block_active_content: false
+  security.mixed_content.block_display_content:  false
+  media.peerconnection.enabled: false //webrtc disabled
+  browser.cache.disk_cache_ssl: true
+  signon.formlessCapture.enabled: true
+  signon.storeWhenAutocompleteOff: true
+  dom.event.contextmenu.enabled: true
+  layout.css.visited_links_enabled: true
+  security.ssl3.ecdhe_rsa_aes_128_sha: true
+  security.ssl3.ecdhe_ecdsa_aes_128_sha: true
+  security.ssl3.dhe_rsa_aes_128_sha: true
+  security.ssl3.rsa_des_ede3_sha: true
+  security.ssl3.dhe_rsa_aes_256_sha: true
+  browser.safebrowsing.blockedURIs.enabled: false
+  media.gmp-provider.enabled: false
+  browser.send_pings.require_same_host: false
+  webgl.disabled: false
+  pdfjs.enableWebGL: false
+  browser.safebrowsing.malware.enabled: false
+  security.csp.experimentalEnabled: false
+  network.http.referer.spoofSource: false
+  security.OCSP.require: false
+  security.ssl.require_safe_negotiation: false
+  privacy.clearOnShutdown.cache: true
+  privacy.clearOnShutdown.downloads: true
+  privacy.clearOnShutdown.formdata: true
+  privacy.clearOnShutdown.history: true
+  privacy.clearOnShutdown.offlineApps: true
+  privacy.clearOnShutdown.passwords: true
+  privacy.clearOnShutdown.sessions: true
+  privacy.clearOnShutdown.siteSettings: true
+
+
+

app/src/main/assets/help/style/cs-help-dark.css

@@ -1,63 +1,63 @@
-
-body{
-    background-color : #1c1b21 !important;
-}
-
-.hi_logo_text{
-  max-width: 450px;
-  width: 65%;
-  height: auto;
-  display: block;
-  margin-left: auto;
-  margin-right: auto;
-  margin-bottom: 30px;
-}
-
-.hi_info{
-  margin-top: 30px;
-  padding-left:15px;
-  padding-bottom: 12px;
-  padding-top: 10px;
-  margin-bottom: 30px;
-  height: auto;
-  color:#d9d9d9;
-  border-left: 5px solid #ff9933;
-}
-
-.hi_bullets{
-  margin-left: 20px;
-  line-height: 30px;
-}
-
-.hi_card{
-cursor: pointer;
-background: #121212 !important;
-color:#cccccc !important;
-}
-
-.hi_card_link{
-  color: #8cb3d9;
-  font-size: 15px;
-}
-
-.hi_issue--color{
-  color: #538cc6;
-}
-
-.hi_arrow--color{
-  color: #538cc6;
-}
-
-.hi_card--margin-top{
-  margin-top: 2%;
-}
-
-.hi_no_select {
-  -webkit-touch-callout: none; /* iOS Safari */
-    -webkit-user-select: none; /* Safari */
-     -khtml-user-select: none; /* Konqueror HTML */
-       -moz-user-select: none; /* Firefox */
-        -ms-user-select: none; /* Internet Explorer/Edge */
-            user-select: none; /* Non-prefixed version, currently
-                                  supported by Chrome and Opera */
+
+body{
+    background-color : #1c1b21 !important;
+}
+
+.hi_logo_text{
+  max-width: 450px;
+  width: 65%;
+  height: auto;
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+  margin-bottom: 30px;
+}
+
+.hi_info{
+  margin-top: 30px;
+  padding-left:15px;
+  padding-bottom: 12px;
+  padding-top: 10px;
+  margin-bottom: 30px;
+  height: auto;
+  color:#d9d9d9;
+  border-left: 5px solid #ff9933;
+}
+
+.hi_bullets{
+  margin-left: 20px;
+  line-height: 30px;
+}
+
+.hi_card{
+cursor: pointer;
+background: #121212 !important;
+color:#cccccc !important;
+}
+
+.hi_card_link{
+  color: #8cb3d9;
+  font-size: 15px;
+}
+
+.hi_issue--color{
+  color: #538cc6;
+}
+
+.hi_arrow--color{
+  color: #538cc6;
+}
+
+.hi_card--margin-top{
+  margin-top: 2%;
+}
+
+.hi_no_select {
+  -webkit-touch-callout: none; /* iOS Safari */
+    -webkit-user-select: none; /* Safari */
+     -khtml-user-select: none; /* Konqueror HTML */
+       -moz-user-select: none; /* Firefox */
+        -ms-user-select: none; /* Internet Explorer/Edge */
+            user-select: none; /* Non-prefixed version, currently
+                                  supported by Chrome and Opera */
 }

app/src/main/assets/help/style/cs-help.css

@@ -1,56 +1,56 @@
-
-.hi_logo_text{
-  max-width: 450px;
-  width: 65%;
-  height: auto;
-  display: block;
-  margin-left: auto;
-  margin-right: auto;
-  margin-bottom: 30px;
-}
-
-.hi_info{
-  margin-top: 30px;
-  padding-left:15px;
-  padding-bottom: 12px;
-  padding-top: 10px;
-  margin-bottom: 30px;
-  height: auto;
-  border-left: 5px solid #ff9933;
-}
-
-.hi_bullets{
-  margin-left: 20px;
-  line-height: 30px;
-}
-
-.hi_card{
-cursor: pointer;
-}
-
-.hi_card_link{
-  color: #6699cc;
-  font-size: 15px;
-}
-
-.hi_issue--color{
-  color: #336699;
-}
-
-.hi_arrow--color{
-  color: #4080bf;
-}
-
-.hi_card--margin-top{
-  margin-top: 2%;
-}
-
-.hi_no_select {
-  -webkit-touch-callout: none; /* iOS Safari */
-    -webkit-user-select: none; /* Safari */
-     -khtml-user-select: none; /* Konqueror HTML */
-       -moz-user-select: none; /* Firefox */
-        -ms-user-select: none; /* Internet Explorer/Edge */
-            user-select: none; /* Non-prefixed version, currently
-                                  supported by Chrome and Opera */
+
+.hi_logo_text{
+  max-width: 450px;
+  width: 65%;
+  height: auto;
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+  margin-bottom: 30px;
+}
+
+.hi_info{
+  margin-top: 30px;
+  padding-left:15px;
+  padding-bottom: 12px;
+  padding-top: 10px;
+  margin-bottom: 30px;
+  height: auto;
+  border-left: 5px solid #ff9933;
+}
+
+.hi_bullets{
+  margin-left: 20px;
+  line-height: 30px;
+}
+
+.hi_card{
+cursor: pointer;
+}
+
+.hi_card_link{
+  color: #6699cc;
+  font-size: 15px;
+}
+
+.hi_issue--color{
+  color: #336699;
+}
+
+.hi_arrow--color{
+  color: #4080bf;
+}
+
+.hi_card--margin-top{
+  margin-top: 2%;
+}
+
+.hi_no_select {
+  -webkit-touch-callout: none; /* iOS Safari */
+    -webkit-user-select: none; /* Safari */
+     -khtml-user-select: none; /* Konqueror HTML */
+       -moz-user-select: none; /* Firefox */
+        -ms-user-select: none; /* Internet Explorer/Edge */
+            user-select: none; /* Non-prefixed version, currently
+                                  supported by Chrome and Opera */
 }

app/src/main/assets/parser/background.js

@@ -1,37 +1,37 @@
-'use strict';
-const port = browser.runtime.connectNative("browser");
-
-async function sendMessageToTab(message) {
- try {
-   let tabs = await browser.tabs.query({})
-   console.log(`background:tabs:${tabs}`)
-   return await browser.tabs.sendMessage(
-     tabs[tabs.length - 1].id,
-     message
-   )
- } catch (e) {
-   console.log(`background:sendMessageToTab:req:error:${e}`)
-   return e.toString();
- }
-}
-//监听 app message
-port.onMessage.addListener(request => {
- let action = request.action;
- if(action === "evalJavascript") {
-     sendMessageToTab(request).then((resp) => {
-       port.postMessage(resp);
-     }).catch((e) => {
-       console.log(`background:sendMessageToTab:resp:error:${e}`)
-     });
-   }
-})
-
-//接收 content.js message
-browser.runtime.onMessage.addListener((data, sender) => {
-   let action = data.action;
-   console.log("background:content:onMessage:" + action);
-   if (action === 'JSBridge') {
-       port.postMessage(data);
-   }
-   return Promise.resolve('done');
+'use strict';
+const port = browser.runtime.connectNative("browser");
+
+async function sendMessageToTab(message) {
+ try {
+   let tabs = await browser.tabs.query({})
+   console.log(`background:tabs:${tabs}`)
+   return await browser.tabs.sendMessage(
+     tabs[tabs.length - 1].id,
+     message
+   )
+ } catch (e) {
+   console.log(`background:sendMessageToTab:req:error:${e}`)
+   return e.toString();
+ }
+}
+//监听 app message
+port.onMessage.addListener(request => {
+ let action = request.action;
+ if(action === "evalJavascript") {
+     sendMessageToTab(request).then((resp) => {
+       port.postMessage(resp);
+     }).catch((e) => {
+       console.log(`background:sendMessageToTab:resp:error:${e}`)
+     });
+   }
+})
+
+//接收 content.js message
+browser.runtime.onMessage.addListener((data, sender) => {
+   let action = data.action;
+   console.log("background:content:onMessage:" + action);
+   if (action === 'JSBridge') {
+       port.postMessage(data);
+   }
+   return Promise.resolve('done');
 })

app/src/main/assets/parser/content.js

@@ -1,81 +1,81 @@
-console.log(`content:start`);
-let JSBridge = {
-    postMessage: function (message) {
-        browser.runtime.sendMessage({
-            action: "JSBridge",
-            data: message
-        });
-    }
-}
-window.wrappedJSObject.JSBridge = cloneInto(
-    JSBridge,
-    window,
-    { cloneFunctions: true });
-
-browser.runtime.onMessage.addListener((data, sender) => {
-    console.log("content:eval:" + data);
-    if (data.action === 'evalJavascript') {
-        return Promise.resolve(document.documentElement.innerHTML);
-    }
-
-    /* Ad-B-Gone: Bookmarklet that removes obnoxious ads from pages */
-    var selectors = [
-    /* By ID: */
-    '#sidebar-wrap', '#advert', '#xrail', '#middle-article-advert-container',
-    '#sponsored-recommendations', '#around-the-web', '#sponsored-recommendations',
-    '#taboola-content', '#taboola-below-taboola-native-thumbnails', '#inarticle_wrapper_div',
-    '#rc-row-container', '#ads', '#at-share-dock', '#at4-share', '#at4-follow', '#right-ads-rail',
-    'div#ad-interstitial', 'div#advert-article', 'div#ac-lre-player-ph',
-    /* By Class: */
-    '.ad', '.avert', '.avert__wrapper', '.middle-banner-ad', '.advertisement',
-    '.GoogleActiveViewClass', '.advert', '.cns-ads-stage', '.teads-inread', '.ad-banner',
-    '.ad-anchored', '.js_shelf_ads', '.ad-slot', '.antenna', '.xrail-content',
-    '.advertisement__leaderboard', '.ad-leaderboard', '.trc_rbox_outer', '.ks-recommended',
-    '.article-da', 'div.sponsored-stories-component', 'div.addthis-smartlayers',
-    'div.article-adsponsor', 'div.signin-prompt', 'div.article-bumper', 'div.video-placeholder',
-    'div.top-ad-container', 'div.header-ad', 'div.ad-unit', 'div.demo-block', 'div.OUTBRAIN',
-    'div.ob-widget', 'div.nwsrm-wrapper', 'div.announcementBar', 'div.partner-resources-block',
-    'div.arrow-down', 'div.m-ad', 'div.story-interrupt', 'div.taboola-recommended',
-    'div.ad-cluster-container', 'div.ctx-sidebar', 'div.incognito-modal', '.OUTBRAIN', '.subscribe-button',
-    '.ads9', '.leaderboards', '.GoogleActiveViewElement', '.mpu-container', '.ad-300x600', '.tf-ad-block',
-    '.sidebar-ads-holder-top', '.ads-one', '.FullPageModal__scroller',
-    '.content-ads-holder', '.widget-area', '.social-buttons', '.ac-player-ph',
-    /* Other: */
-    'script', 'iframe', 'video', 'aside#sponsored-recommendations', 'aside[role="banner"]', 'aside',
-    'amp-ad', 'span[id^=ad_is_]', 'div[class*="indianapolis-optin"]', 'div[id^=google_ads_iframe]',
-    'div[data-google-query-id]', 'section[data-response]', 'ins.adsbygoogle', 'div[data-google-query-id]',
-    'div[data-test-id="fullPageSignupModal"]', 'div[data-test-id="giftWrap"]' ];
-    for(let i in selectors) {
-        let nodesList = document.querySelectorAll(selectors[i]);
-        for(let i = 0; i < nodesList.length; i++) {
-            let el = nodesList[i];
-            if(el && el.parentNode)
-                el.parentNode.removeChild(el);
-        }
-    }
-    document.cookie="VISITOR_INFO1_LIVE=oKckVSqvaGw; path=/; domain=.youtube.com";
-
-});
-
-function randomColor() {
-  return "#" + Math.floor(Math.random()*16777215).toString(16);
-}
-
-var pattern = "*bbc*";
-
-var image = `
-  <svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%">
-    <rect width="100%" height="100%" fill="${randomColor()}"/>
-  </svg>
-`;
-
-function listener(details) {
-  let redirectUrl = "https://google.com";
-  return {redirectUrl};
-}
-
-browser.webRequest.onBeforeRequest.addListener(
-  listener,
-  {urls: [pattern], types: ["image"]},
-  ["blocking"]
+console.log(`content:start`);
+let JSBridge = {
+    postMessage: function (message) {
+        browser.runtime.sendMessage({
+            action: "JSBridge",
+            data: message
+        });
+    }
+}
+window.wrappedJSObject.JSBridge = cloneInto(
+    JSBridge,
+    window,
+    { cloneFunctions: true });
+
+browser.runtime.onMessage.addListener((data, sender) => {
+    console.log("content:eval:" + data);
+    if (data.action === 'evalJavascript') {
+        return Promise.resolve(document.documentElement.innerHTML);
+    }
+
+    /* Ad-B-Gone: Bookmarklet that removes obnoxious ads from pages */
+    var selectors = [
+    /* By ID: */
+    '#sidebar-wrap', '#advert', '#xrail', '#middle-article-advert-container',
+    '#sponsored-recommendations', '#around-the-web', '#sponsored-recommendations',
+    '#taboola-content', '#taboola-below-taboola-native-thumbnails', '#inarticle_wrapper_div',
+    '#rc-row-container', '#ads', '#at-share-dock', '#at4-share', '#at4-follow', '#right-ads-rail',
+    'div#ad-interstitial', 'div#advert-article', 'div#ac-lre-player-ph',
+    /* By Class: */
+    '.ad', '.avert', '.avert__wrapper', '.middle-banner-ad', '.advertisement',
+    '.GoogleActiveViewClass', '.advert', '.cns-ads-stage', '.teads-inread', '.ad-banner',
+    '.ad-anchored', '.js_shelf_ads', '.ad-slot', '.antenna', '.xrail-content',
+    '.advertisement__leaderboard', '.ad-leaderboard', '.trc_rbox_outer', '.ks-recommended',
+    '.article-da', 'div.sponsored-stories-component', 'div.addthis-smartlayers',
+    'div.article-adsponsor', 'div.signin-prompt', 'div.article-bumper', 'div.video-placeholder',
+    'div.top-ad-container', 'div.header-ad', 'div.ad-unit', 'div.demo-block', 'div.OUTBRAIN',
+    'div.ob-widget', 'div.nwsrm-wrapper', 'div.announcementBar', 'div.partner-resources-block',
+    'div.arrow-down', 'div.m-ad', 'div.story-interrupt', 'div.taboola-recommended',
+    'div.ad-cluster-container', 'div.ctx-sidebar', 'div.incognito-modal', '.OUTBRAIN', '.subscribe-button',
+    '.ads9', '.leaderboards', '.GoogleActiveViewElement', '.mpu-container', '.ad-300x600', '.tf-ad-block',
+    '.sidebar-ads-holder-top', '.ads-one', '.FullPageModal__scroller',
+    '.content-ads-holder', '.widget-area', '.social-buttons', '.ac-player-ph',
+    /* Other: */
+    'script', 'iframe', 'video', 'aside#sponsored-recommendations', 'aside[role="banner"]', 'aside',
+    'amp-ad', 'span[id^=ad_is_]', 'div[class*="indianapolis-optin"]', 'div[id^=google_ads_iframe]',
+    'div[data-google-query-id]', 'section[data-response]', 'ins.adsbygoogle', 'div[data-google-query-id]',
+    'div[data-test-id="fullPageSignupModal"]', 'div[data-test-id="giftWrap"]' ];
+    for(let i in selectors) {
+        let nodesList = document.querySelectorAll(selectors[i]);
+        for(let i = 0; i < nodesList.length; i++) {
+            let el = nodesList[i];
+            if(el && el.parentNode)
+                el.parentNode.removeChild(el);
+        }
+    }
+    document.cookie="VISITOR_INFO1_LIVE=oKckVSqvaGw; path=/; domain=.youtube.com";
+
+});
+
+function randomColor() {
+  return "#" + Math.floor(Math.random()*16777215).toString(16);
+}
+
+var pattern = "*bbc*";
+
+var image = `
+  <svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%">
+    <rect width="100%" height="100%" fill="${randomColor()}"/>
+  </svg>
+`;
+
+function listener(details) {
+  let redirectUrl = "https://google.com";
+  return {redirectUrl};
+}
+
+browser.webRequest.onBeforeRequest.addListener(
+  listener,
+  {urls: [pattern], types: ["image"]},
+  ["blocking"]
 );

app/src/main/assets/parser/eslintrc.js

@@ -1,11 +1,11 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-"use strict";
-
-module.exports = {
-  env: {
-    webextensions: true,
-  },
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict";
+
+module.exports = {
+  env: {
+    webextensions: true,
+  },
 };

app/src/main/assets/parser/manifest.json

@@ -1,36 +1,36 @@
-{
-  "manifest_version": 2,
-  "name": "Messaging",
-  "description": "Uses the proxy API to block requests to specific hosts.",
-  "version": "3.0",
-  "browser_specific_settings": {
-    "gecko": {
-      "strict_min_version": "65.0",
-      "id": "messaging@example.com"
-    }
-  },
-  "content_scripts": [
-    {
-      "matches": [
-        "<all_urls>"
-      ],
-      "js": [
-        "content.js"
-      ],
-      "run_at": "document_start"
-    }
-  ],
-  "background": {
-    "scripts": [
-      "background.js"
-    ]
-  },
-  "permissions": [
-    "nativeMessaging",
-    "geckoViewAddons",
-    "webRequest",
-    "tabs",
-    "webRequestBlocking",
-    "<all_urls>"
-  ]
+{
+  "manifest_version": 2,
+  "name": "Messaging",
+  "description": "Uses the proxy API to block requests to specific hosts.",
+  "version": "3.0",
+  "browser_specific_settings": {
+    "gecko": {
+      "strict_min_version": "65.0",
+      "id": "messaging@example.com"
+    }
+  },
+  "content_scripts": [
+    {
+      "matches": [
+        "<all_urls>"
+      ],
+      "js": [
+        "content.js"
+      ],
+      "run_at": "document_start"
+    }
+  ],
+  "background": {
+    "scripts": [
+      "background.js"
+    ]
+  },
+  "permissions": [
+    "nativeMessaging",
+    "geckoViewAddons",
+    "webRequest",
+    "tabs",
+    "webRequestBlocking",
+    "<all_urls>"
+  ]
 }