v8.7 Android

foxyproxy · Dec 16, 2023 · 28cb50c · 28cb50c
1 parent be7049f
commit 28cb50c
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 24 deletions.
diff --git a/src/content/app.js b/src/content/app.js
@@ -24,7 +24,9 @@ export const pref = {
 export class App {
 
   static firefox = navigator.userAgent.includes('Firefox');
+  static android = navigator.userAgent.includes('Android');
   // static chrome = navigator.userAgent.includes('Chrome');
+  // static isBasic = browser.runtime.getManifest().name === browser.i18n.getMessage('extensionNameBasic');
 
   // ---------- User Preferences ---------------------------
   static defaultPref = JSON.stringify(pref);
@@ -101,16 +103,4 @@ export class App {
       const pxy = pref.data.find(i => host === `${i.hostname}:${i.port}`);
 */
   }
-
-  static isBasic() {
-    return browser.runtime.getManifest().name === browser.i18n.getMessage('extensionNameBasic');
-  }
-
-  // https://bugzilla.mozilla.org/show_bug.cgi?id=1725981
-  // proxy.settings is not supported on Android
-  static hasProxySettings = this.checkProxySettings();
-  static checkProxySettings() {
-    try { browser.proxy.settings; return true; }
-    catch { return false; }
-  }
 }
diff --git a/src/content/background.js b/src/content/background.js
@@ -30,7 +30,7 @@ class ProcessPref {
 // ---------- /Process Preferences -------------------------
 
 // ---------- Initialisation -------------------------------
-browser.runtime.onInstalled.addListener(e => {
-  // show help
-  // ['install', 'update'].includes(e.reason) && browser.tabs.create({url: '/content/help.html'});
-});
+// browser.runtime.onInstalled.addListener(e => {
+//   // show help
+//   ['install', 'update'].includes(e.reason) && browser.tabs.create({url: '/content/help.html'});
+// });
diff --git a/src/content/on-request.js b/src/content/on-request.js
@@ -98,7 +98,7 @@ export class OnRequest {
       // --- standard operation
       case this.mode === 'disable':                         // pass direct
       case this.mode === 'direct':                          // pass direct
-      case this.mode.includes('://'):                       // PAC URL is set
+      case this.mode.includes('://') && !/:\d+$/.test(this.mode): // PAC URL is set
         return {type: 'direct'};
 
       case this.mode === 'pattern':                         // check if url matches patterns
@@ -247,4 +247,4 @@ export class OnRequest {
     const pxy = this.tabProxy[tab.id];
     pxy ? PageAction.set(tab.id, pxy) : this.checkPageAction(tab);
   }
-}
+}
diff --git a/src/content/options.js b/src/content/options.js
@@ -179,7 +179,7 @@ class Options {
     // get from storage in case it was changed while options page has been open
     let {mode} = await browser.storage.local.get({mode: 'disable'});
     switch (true) {
-      case pref.mode.includes('://') && !pref.data.some(i => i.active && i.type === 'pac' && mode === i.pac):
+      case pref.mode.includes('://') && !/:\d+$/.test(pref.mode) && !pref.data.some(i => i.active && i.type === 'pac' && mode === i.pac):
       case pref.mode.includes(':') && !pref.data.some(i => i.active && i.type !== 'pac' && mode === `${i.hostname}:${i.port}`):
       case pref.mode === 'pattern' && !pref.data.some(i => i.active && i.include[0]):
         mode = 'disable';
@@ -462,7 +462,7 @@ class Proxies {
     Log.mode = pref.mode;
 
     // --- hide elements for Basic
-    // App.isBasic && this.proxyDiv.classList.add('basic');
+    App.isBasic && this.proxyDiv.classList.add('basic');
 
     this.process();
   }

diff --git a/src/content/popup.js b/src/content/popup.js
@@ -34,7 +34,7 @@ class Popup {
     const docFrag = document.createDocumentFragment();
 
     // check if there are patterns, hide elements for Basic
-    if (/* App.isBasic || */ !pref.data.some(i => i.active && i.include[0])) {
+    if (App.isBasic || !pref.data.some(i => i.active && i.include[0])) {
       this.list.children[0].style.display = 'none';         // hide option if there are no patterns
       pref.mode === 'pattern' && (pref.mode = 'disable');   // show as disable
     }

diff --git a/src/content/proxy.js b/src/content/proxy.js
@@ -49,7 +49,7 @@ export class Proxy {
   static async getSettings() {
     // https://bugzilla.mozilla.org/show_bug.cgi?id=1725981
     // proxy.settings is not supported on Android
-    if (!App.hasProxySettings) { return {}; }
+    if (App.android) { return {}; }
 
     const conf = await browser.proxy.settings.get({});
 
@@ -104,7 +104,7 @@ export class Proxy {
 
     // https://bugzilla.mozilla.org/show_bug.cgi?id=1725981
     // proxy.settings is not supported on Android
-    if (!App.hasProxySettings) { return; }
+    if (App.android) { return; }
 
     // Incognito Access
     const allowed = await browser.extension.isAllowedIncognitoAccess();
@@ -146,7 +146,7 @@ export class Proxy {
         break;
 
       // --- Proxy Auto-Configuration (PAC) URL
-      case pref.mode.includes('://'):
+      case pref.mode.includes('://') && !/:\d+$/.test(pref.mode):
         config.value.mode = 'pac_script';
         config.value.pacScript = {mandatory: true};
         config.value.pacScript.url = pref.mode;