[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [Git][tpo/applications/tor-browser][tor-browser-115.15.0esr-13.5-1] 2 commits: fixup! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing

Title: GitLab

morgan pushed to branch tor-browser-115.15.0esr-13.5-1 at The Tor Project / Applications / Tor Browser

Commits:

  • 15c91aa5
    by Pier Angelo Vendrame at 2024-09-12T16:59:19+02:00 
    fixup! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing

Bug 41835: Remove Twitter, Yahoo, and YouTube.
  • c5402ad1
    by Pier Angelo Vendrame at 2024-09-12T16:59:20+02:00 
    fixup! Bug 41435: Add a Tor Browser migration function

Bug: Review default search engine options.

Migration code for removing Twitter, Yahoo, and YouTube from the local
extension database.

8 changed files:

Changes:

  • browser/components/BrowserGlue.sys.mjs
    ... ... @@ -4584,7 +4584,9 @@ BrowserGlue.prototype = {
    4584 4584 
         //            torbutton preferences that are not used anymore.
    4585 4585 
         // Version 3: Tor Browser 13.0.7/13.5a3: Remove blockchair
    4586 4586 
         //            (tor-browser#42283).
    4587 
    -    const TBB_MIGRATION_VERSION = 3;
    4587 
    +    // Version 4: Tor Browser 14.0a4 (2024-09-02), 13.5.4: Remove Twitter, Yahoo
    4588 
    +    //            and YouTube search engines (tor-browser#41835).
    4589 
    +    const TBB_MIGRATION_VERSION = 4;
    4588 4590 
         const MIGRATION_PREF = "torbrowser.migration.version";
    4589 4591
    4590 4592 
         // If we decide to force updating users to pass through any version
    ... ... @@ -4636,21 +4638,26 @@ BrowserGlue.prototype = {
    4636 4638 
             }
    4637 4639 
           }
    4638 4640 
         }
    4639 
    -    if (currentVersion < 3) {
    4640 
    -      (async () => {
    4641 
    +    const dropAddons = async list => {
    4642 
    +      for (const id of list) {
    4641 4643 
             try {
    4642 
    -          const engine = await lazy.AddonManager.getAddonByID(
    4643 
    -            "blockchair@xxxxxxxxxxxxxxxxxx"
    4644 
    -          );
    4644 
    +          const engine = await lazy.AddonManager.getAddonByID(id);
    4645 4645 
               await engine?.uninstall();
    4646 4646 
             } catch {}
    4647 
    -        try {
    4648 
    -          const engine = await lazy.AddonManager.getAddonByID(
    4649 
    -            "blockchair-onion@xxxxxxxxxxxxxxxxxx"
    4650 
    -          );
    4651 
    -          engine?.uninstall();
    4652 
    -        } catch {}
    4653 
    -      })();
    4647 
    +      }
    4648 
    +    };
    4649 
    +    if (currentVersion < 3) {
    4650 
    +      dropAddons([
    4651 
    +        "blockchair@xxxxxxxxxxxxxxxxxx",
    4652 
    +        "blockchair-onion@xxxxxxxxxxxxxxxxxx",
    4653 
    +      ]);
    4654 
    +    }
    4655 
    +    if (currentVersion < 4) {
    4656 
    +      dropAddons([
    4657 
    +        "twitter@xxxxxxxxxxxxxxxxxx",
    4658 
    +        "yahoo@xxxxxxxxxxxxxxxxxx",
    4659 
    +        "youtube@xxxxxxxxxxxxxxxxxx",
    4660 
    +      ]);
    4654 4661 
         }
    4655 4662
    4656 4663 
         Services.prefs.setIntPref(MIGRATION_PREF, TBB_MIGRATION_VERSION);

  • browser/components/search/extensions/twitter/favicon.ico deleted
    No preview for this file type
  • browser/components/search/extensions/twitter/manifest.json deleted
    1 
    -{
    2 
    -  "name": "Twitter",
    3 
    -  "description": "Realtime Twitter Search",
    4 
    -  "manifest_version": 2,
    5 
    -  "version": "1.0",
    6 
    -  "applications": {
    7 
    -    "gecko": {
    8 
    -      "id": "twitter@xxxxxxxxxxxxxxxxxx"
    9 
    -    }
    10 
    -  },
    11 
    -  "hidden": true,
    12 
    -  "icons": {
    13 
    -    "16": "favicon.ico"
    14 
    -  },
    15 
    -  "web_accessible_resources": [
    16 
    -    "favicon.ico"
    17 
    -  ],
    18 
    -  "chrome_settings_overrides": {
    19 
    -    "search_provider": {
    20 
    -      "name": "Twitter",
    21 
    -      "search_url": "https://twitter.com/search",
    22 
    -      "search_form": "https://twitter.com/search?q={searchTerms}&partner=Firefox&source=desktop-search",
    23 
    -      "search_url_get_params": "q={searchTerms}&partner=Firefox&source=desktop-search"
    24 
    -    }
    25 
    -  }
    26 
    -}
    \ No newline at end of file

  • browser/components/search/extensions/yahoo/favicon.ico deleted
    No preview for this file type
  • browser/components/search/extensions/yahoo/manifest.json deleted
    1 
    -{
    2 
    -  "name": "Yahoo",
    3 
    -  "description": "Yahoo Search",
    4 
    -  "manifest_version": 2,
    5 
    -  "version": "1.0",
    6 
    -  "applications": {
    7 
    -    "gecko": {
    8 
    -      "id": "yahoo@xxxxxxxxxxxxxxxxxx"
    9 
    -    }
    10 
    -  },
    11 
    -  "hidden": true,
    12 
    -  "icons": {
    13 
    -    "16": "favicon.ico"
    14 
    -  },
    15 
    -  "web_accessible_resources": [
    16 
    -    "favicon.ico"
    17 
    -  ],
    18 
    -  "chrome_settings_overrides": {
    19 
    -    "search_provider": {
    20 
    -      "name": "Yahoo",
    21 
    -      "search_url": "https://search.yahoo.com/yhs/search",
    22 
    -      "search_form": "https://search.yahoo.com/yhs/search?p={searchTerms}&ei=UTF-8&hspart=mozilla",
    23 
    -      "search_url_get_params": "p={searchTerms}&ei=UTF-8&hspart=mozilla",
    24 
    -      "suggest_url": "https://search.yahoo.com/sugg/ff",
    25 
    -      "suggest_url_get_params": "output=fxjson&appid=ffd&command={searchTerms}"
    26 
    -    }
    27 
    -  }
    28 
    -}

  • browser/components/search/extensions/youtube/favicon.ico deleted
    No preview for this file type
  • browser/components/search/extensions/youtube/manifest.json deleted
    1 
    -{
    2 
    -  "name": "YouTube",
    3 
    -  "description": "YouTube - Videos",
    4 
    -  "manifest_version": 2,
    5 
    -  "version": "1.0",
    6 
    -  "applications": {
    7 
    -    "gecko": {
    8 
    -      "id": "youtube@xxxxxxxxxxxxxxxxxx"
    9 
    -    }
    10 
    -  },
    11 
    -  "hidden": true,
    12 
    -  "icons": {
    13 
    -    "16": "favicon.ico"
    14 
    -  },
    15 
    -  "web_accessible_resources": [
    16 
    -    "favicon.ico"
    17 
    -  ],
    18 
    -  "chrome_settings_overrides": {
    19 
    -    "search_provider": {
    20 
    -      "name": "YouTube",
    21 
    -      "search_url": "https://www.youtube.com/results?search_query={searchTerms}&search=Search",
    22 
    -      "search_form": "https://www.youtube.com/index",
    23 
    -      "suggest_url": "https://suggestqueries.google.com/complete/search?output=firefox&ds=yt&q={searchTerms}"
    24 
    -    }
    25 
    -  }
    26 
    -}
    \ No newline at end of file

  • toolkit/components/search/SearchService.sys.mjs
    ... ... @@ -2280,14 +2280,10 @@ export class SearchService {
    2280 2280 
       async _fetchEngineSelectorEngines() {
    2281 2281 
         const engines = [
    2282 2282 
           { webExtension: { id: "ddg@xxxxxxxxxxxxxxxxxx" }, orderHint: 100 },
    2283 
    -      { webExtension: { id: "youtube@xxxxxxxxxxxxxxxxxx" }, orderHint: 90 },
    2284 
    -      { webExtension: { id: "google@xxxxxxxxxxxxxxxxxx" }, orderHint: 80 },
    2285 
    -      { webExtension: { id: "ddg-onion@xxxxxxxxxxxxxxxxxx" }, orderHint: 70 },
    2286 
    -      { webExtension: { id: "startpage@xxxxxxxxxxxxxxxxxx" }, orderHint: 60 },
    2287 
    -      { webExtension: { id: "startpage-onion@xxxxxxxxxxxxxxxxxx" }, orderHint: 50 },
    2288 
    -      { webExtension: { id: "twitter@xxxxxxxxxxxxxxxxxx" }, orderHint: 40 },
    2289 
    -      { webExtension: { id: "wikipedia@xxxxxxxxxxxxxxxxxx" }, orderHint: 30 },
    2290 
    -      { webExtension: { id: "yahoo@xxxxxxxxxxxxxxxxxx" }, orderHint: 20 },
    2283 
    +      { webExtension: { id: "ddg-onion@xxxxxxxxxxxxxxxxxx" }, orderHint: 90 },
    2284 
    +      { webExtension: { id: "startpage@xxxxxxxxxxxxxxxxxx" }, orderHint: 80 },
    2285 
    +      { webExtension: { id: "startpage-onion@xxxxxxxxxxxxxxxxxx" }, orderHint: 70 },
    2286 
    +      { webExtension: { id: "wikipedia@xxxxxxxxxxxxxxxxxx" }, orderHint: 60 },
    2291 2287 
         ];
    2292 2288
    2293 2289 
         for (let e of engines) {

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications · Help 

    _______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits