Experimental Android support #21

foxyproxy · Sep 16, 2023 · dfac35f · dfac35f
1 parent 3780d04
commit dfac35f
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 11 deletions.
diff --git a/src/content/about.html b/src/content/about.html
@@ -19,6 +19,7 @@ <h2 id="changelog">Changelog</h2>
       <dt>8.0</dt>
       <dd>Added complete Light/Dark Theme</dd>
       <dd>Added Exclude host feature</dd>
+      <dd>Added experimental Firefox on Android support (#21)</dd>
       <dd>Added Get Location feature</dd>
       <dd>Added Global Exclude</dd>
       <dd>Added Host Pattern to proxy feature</dd>
@@ -33,7 +34,6 @@ <h2 id="changelog">Changelog</h2>
       <dd>Update User Interface</dd>
       <dd>Updated code & style for manifest v3 (MV3) compatibility</dd>
       <dd>Updated Import Proxy List</dd>
-      <dd></dd>
 
     </dl>
 

diff --git a/src/content/help.html b/src/content/help.html
@@ -46,6 +46,9 @@ <h3>Proxy Authentication</h3>
       <li>Authentication is port-specific i.e. there can be different user/pass for <code>example.com:3128</code> & <code>example.com:443</code></li>
     </ul>
 
+    <h3 class="experimental">Firefox on Android</h3>
+    <p>Support is experimental and based on user feedback.</p>
+
     <h1 id="how-to">How to Use</h1>
 
     <h4>Light/Dark Theme</h4>
@@ -215,7 +218,7 @@ <h3>Individual Proxy</h3>
       <dd>To be used for HTTP/HTTPS/SOCKS types</dd>
       <dd>If not set, authentication will be handled by the browser</dd>
 
-      <dt>PAC URL</dt>
+      <dt>PAC URL <span>(not available on Android)</span></dt>
       <dd>Required for PAC type</dd>
 
     </dl>

diff --git a/src/content/options.js b/src/content/options.js
@@ -18,7 +18,9 @@ class IncognitoAccess{
   static {
     // https://developer.mozilla.org/docs/Mozilla/Add-ons/WebExtensions/API/proxy/settings
     // Changing proxy settings requires private browsing window access because proxy settings affect private and non-private windows.
-    App.firefox && browser.extension.isAllowedIncognitoAccess()
+    // https://bugzilla.mozilla.org/show_bug.cgi?id=1725981
+    // proxy.settings is not supported on Android
+    App.firefox && browser.proxy.settings && browser.extension.isAllowedIncognitoAccess()
     .then(response => !response && alert(browser.i18n.getMessage('incognitoAccessError')));
   }
 }

diff --git a/src/content/proxy.js b/src/content/proxy.js
@@ -4,9 +4,14 @@ import {OnRequest} from './on-request.js';
 import {Action} from './action.js';
 
 export class Proxy {
-  // proxy.settings not supported on Android
-  // https://bugzilla.mozilla.org/show_bug.cgi?id=1725981
-  static async getSettings() {
+
+  static async #getSettings() {
+    // https://bugzilla.mozilla.org/show_bug.cgi?id=1725981
+    // proxy.settings is not supported on Android
+    if (!browser.proxy.settings) {
+      return {value: {}};
+    }
+
     const conf = await browser.proxy.settings.get({});
     // https://bugs.chromium.org/p/chromium/issues/detail?id=29683
     // https://developer.chrome.com/docs/extensions/mv3/manifest/icons/
@@ -42,33 +47,33 @@ export class Proxy {
 
   static async #setFirefox(pref) {
     // retain settings as Network setting is partially customisable
-    const conf = await this.getSettings();
+    const conf = await this.#getSettings();
     const value = conf.value;
     OnRequest.mode = pref.mode;
     switch (true) {
       case pref.mode === 'disable':
         value.proxyType = 'system';
-        browser.proxy.settings.set({value});
+        browser.proxy.settings?.set({value});
         break;
 
       // Automatic proxy configuration URL
       case pref.mode.includes('://'):
         value.proxyType = 'autoConfig';
         value.autoConfigUrl = mode;
-        browser.proxy.settings.set({value});
+        browser.proxy.settings?.set({value});
         break;
 
       // pattern or single proxy
       default:
         value.proxyType = 'system';
-        browser.proxy.settings.set({value});
+        browser.proxy.settings?.set({value});
         OnRequest.init(pref);
     }
   }
 
   static #setChrome(pref) {
     // check if proxy.settings is controlled_by_this_extension
-    this.getSettings();
+    this.#getSettings();
 
     // https://developer.chrome.com/docs/extensions/reference/types/
     // Scope and life cycle: regular | regular_only | incognito_persistent | incognito_session_only