From e6e51061aff70d98899c11ab1352fdb0911ce529 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Mon, 18 Apr 2022 18:55:17 -0500 Subject: Issue #7 - Remove Weave --- components/moz.build | 3 - components/weave/WeaveComponents.manifest | 13 - .../weave/content/aboutSyncTabs-bindings.xml | 46 - components/weave/content/aboutSyncTabs.css | 11 - components/weave/content/aboutSyncTabs.js | 313 ---- components/weave/content/aboutSyncTabs.xul | 67 - components/weave/content/addDevice.js | 157 -- components/weave/content/addDevice.xul | 129 -- components/weave/content/genericChange.js | 234 --- components/weave/content/genericChange.xul | 123 -- components/weave/content/key.xhtml | 54 - components/weave/content/notification.xml | 129 -- components/weave/content/progress.js | 71 - components/weave/content/progress.xhtml | 55 - components/weave/content/quota.js | 247 --- components/weave/content/quota.xul | 65 - components/weave/content/setup.js | 1071 ------------- components/weave/content/setup.xul | 491 ------ components/weave/content/utils.js | 218 --- components/weave/jar.mn | 37 - components/weave/locales/en-US/aboutSyncTabs.dtd | 21 - components/weave/locales/en-US/errors.properties | 27 - components/weave/locales/en-US/sync.properties | 55 - .../locales/en-US/syncGenericChange.properties | 37 - components/weave/locales/en-US/syncKey.dtd | 18 - components/weave/locales/en-US/syncProgress.dtd | 15 - components/weave/locales/en-US/syncQuota.dtd | 8 - .../weave/locales/en-US/syncQuota.properties | 42 - components/weave/locales/en-US/syncSetup.dtd | 116 -- .../weave/locales/en-US/syncSetup.properties | 51 - components/weave/locales/jar.mn | 18 - components/weave/locales/l10n.ini | 9 - components/weave/locales/moz.build | 6 - components/weave/moz.build | 77 - components/weave/public/nsISyncJPAKE.idl | 103 -- components/weave/skin/aboutSyncTabs.css | 101 -- components/weave/skin/sync-128.png | Bin 20229 -> 0 bytes components/weave/skin/sync-16.png | Bin 1847 -> 0 bytes components/weave/skin/sync-32.png | Bin 3384 -> 0 bytes components/weave/skin/sync-bg.png | Bin 21309 -> 0 bytes components/weave/skin/sync-desktopIcon.png | Bin 291 -> 0 bytes components/weave/skin/sync-mobileIcon.png | Bin 352 -> 0 bytes components/weave/skin/syncCommon.css | 53 - components/weave/skin/syncProgress.css | 46 - components/weave/skin/syncQuota.css | 26 - components/weave/skin/syncSetup.css | 134 -- components/weave/src/WeaveService.js | 177 --- components/weave/src/common/hawkclient.js | 346 ----- components/weave/src/common/hawkrequest.js | 198 --- components/weave/src/common/logmanager.js | 331 ---- components/weave/src/common/observers.js | 150 -- components/weave/src/common/rest.js | 764 --------- components/weave/src/common/services-common.js | 11 - components/weave/src/common/stringbundle.js | 203 --- components/weave/src/common/tokenserverclient.js | 459 ------ components/weave/src/crypto/WeaveCrypto.js | 262 ---- components/weave/src/crypto/utils.js | 588 ------- components/weave/src/engines/addons.js | 706 --------- components/weave/src/engines/bookmarks.js | 1542 ------------------- components/weave/src/engines/clients.js | 476 ------ components/weave/src/engines/forms.js | 246 --- components/weave/src/engines/history.js | 417 ----- components/weave/src/engines/passwords.js | 305 ---- components/weave/src/engines/prefs.js | 260 ---- components/weave/src/engines/tabs.js | 376 ----- components/weave/src/nsSyncJPAKE.cpp | 484 ------ components/weave/src/nsSyncJPAKE.h | 38 - components/weave/src/stages/cluster.js | 111 -- components/weave/src/stages/declined.js | 76 - components/weave/src/stages/enginesync.js | 326 ---- components/weave/src/sync/addonsreconciler.js | 674 -------- components/weave/src/sync/addonutils.js | 474 ------ components/weave/src/sync/constants.js | 193 --- components/weave/src/sync/engines.js | 1613 -------------------- components/weave/src/sync/identity.js | 603 -------- components/weave/src/sync/jpakeclient.js | 773 ---------- components/weave/src/sync/keys.js | 214 --- components/weave/src/sync/main.js | 31 - components/weave/src/sync/notifications.js | 131 -- components/weave/src/sync/policies.js | 967 ------------ components/weave/src/sync/record.js | 628 -------- components/weave/src/sync/resource.js | 678 -------- components/weave/src/sync/rest.js | 106 -- components/weave/src/sync/service.js | 1586 ------------------- components/weave/src/sync/status.js | 142 -- components/weave/src/sync/userapi.js | 224 --- components/weave/src/sync/util.js | 693 --------- components/weave/weave-prefs.js | 83 - 88 files changed, 23162 deletions(-) delete mode 100644 components/weave/WeaveComponents.manifest delete mode 100644 components/weave/content/aboutSyncTabs-bindings.xml delete mode 100644 components/weave/content/aboutSyncTabs.css delete mode 100644 components/weave/content/aboutSyncTabs.js delete mode 100644 components/weave/content/aboutSyncTabs.xul delete mode 100644 components/weave/content/addDevice.js delete mode 100644 components/weave/content/addDevice.xul delete mode 100644 components/weave/content/genericChange.js delete mode 100644 components/weave/content/genericChange.xul delete mode 100644 components/weave/content/key.xhtml delete mode 100644 components/weave/content/notification.xml delete mode 100644 components/weave/content/progress.js delete mode 100644 components/weave/content/progress.xhtml delete mode 100644 components/weave/content/quota.js delete mode 100644 components/weave/content/quota.xul delete mode 100644 components/weave/content/setup.js delete mode 100644 components/weave/content/setup.xul delete mode 100644 components/weave/content/utils.js delete mode 100644 components/weave/jar.mn delete mode 100644 components/weave/locales/en-US/aboutSyncTabs.dtd delete mode 100644 components/weave/locales/en-US/errors.properties delete mode 100644 components/weave/locales/en-US/sync.properties delete mode 100644 components/weave/locales/en-US/syncGenericChange.properties delete mode 100644 components/weave/locales/en-US/syncKey.dtd delete mode 100644 components/weave/locales/en-US/syncProgress.dtd delete mode 100644 components/weave/locales/en-US/syncQuota.dtd delete mode 100644 components/weave/locales/en-US/syncQuota.properties delete mode 100644 components/weave/locales/en-US/syncSetup.dtd delete mode 100644 components/weave/locales/en-US/syncSetup.properties delete mode 100644 components/weave/locales/jar.mn delete mode 100644 components/weave/locales/l10n.ini delete mode 100644 components/weave/locales/moz.build delete mode 100644 components/weave/moz.build delete mode 100644 components/weave/public/nsISyncJPAKE.idl delete mode 100644 components/weave/skin/aboutSyncTabs.css delete mode 100644 components/weave/skin/sync-128.png delete mode 100644 components/weave/skin/sync-16.png delete mode 100644 components/weave/skin/sync-32.png delete mode 100644 components/weave/skin/sync-bg.png delete mode 100644 components/weave/skin/sync-desktopIcon.png delete mode 100644 components/weave/skin/sync-mobileIcon.png delete mode 100644 components/weave/skin/syncCommon.css delete mode 100644 components/weave/skin/syncProgress.css delete mode 100644 components/weave/skin/syncQuota.css delete mode 100644 components/weave/skin/syncSetup.css delete mode 100644 components/weave/src/WeaveService.js delete mode 100644 components/weave/src/common/hawkclient.js delete mode 100644 components/weave/src/common/hawkrequest.js delete mode 100644 components/weave/src/common/logmanager.js delete mode 100644 components/weave/src/common/observers.js delete mode 100644 components/weave/src/common/rest.js delete mode 100644 components/weave/src/common/services-common.js delete mode 100644 components/weave/src/common/stringbundle.js delete mode 100644 components/weave/src/common/tokenserverclient.js delete mode 100644 components/weave/src/crypto/WeaveCrypto.js delete mode 100644 components/weave/src/crypto/utils.js delete mode 100644 components/weave/src/engines/addons.js delete mode 100644 components/weave/src/engines/bookmarks.js delete mode 100644 components/weave/src/engines/clients.js delete mode 100644 components/weave/src/engines/forms.js delete mode 100644 components/weave/src/engines/history.js delete mode 100644 components/weave/src/engines/passwords.js delete mode 100644 components/weave/src/engines/prefs.js delete mode 100644 components/weave/src/engines/tabs.js delete mode 100644 components/weave/src/nsSyncJPAKE.cpp delete mode 100644 components/weave/src/nsSyncJPAKE.h delete mode 100644 components/weave/src/stages/cluster.js delete mode 100644 components/weave/src/stages/declined.js delete mode 100644 components/weave/src/stages/enginesync.js delete mode 100644 components/weave/src/sync/addonsreconciler.js delete mode 100644 components/weave/src/sync/addonutils.js delete mode 100644 components/weave/src/sync/constants.js delete mode 100644 components/weave/src/sync/engines.js delete mode 100644 components/weave/src/sync/identity.js delete mode 100644 components/weave/src/sync/jpakeclient.js delete mode 100644 components/weave/src/sync/keys.js delete mode 100644 components/weave/src/sync/main.js delete mode 100644 components/weave/src/sync/notifications.js delete mode 100644 components/weave/src/sync/policies.js delete mode 100644 components/weave/src/sync/record.js delete mode 100644 components/weave/src/sync/resource.js delete mode 100644 components/weave/src/sync/rest.js delete mode 100644 components/weave/src/sync/service.js delete mode 100644 components/weave/src/sync/status.js delete mode 100644 components/weave/src/sync/userapi.js delete mode 100644 components/weave/src/sync/util.js delete mode 100644 components/weave/weave-prefs.js (limited to 'components') diff --git a/components/moz.build b/components/moz.build index 5bb3ba83a..78af3359f 100644 --- a/components/moz.build +++ b/components/moz.build @@ -110,9 +110,6 @@ if CONFIG['MOZ_ENABLE_XREMOTE']: if CONFIG['MOZ_TOOLKIT_SEARCH']: DIRS += ['search'] -if CONFIG['MOZ_SERVICES_SYNC']: - DIRS += ['weave'] - DIRS += ['build'] EXTRA_COMPONENTS += [ diff --git a/components/weave/WeaveComponents.manifest b/components/weave/WeaveComponents.manifest deleted file mode 100644 index 816a9e2b4..000000000 --- a/components/weave/WeaveComponents.manifest +++ /dev/null @@ -1,13 +0,0 @@ -# WeaveService.js -component {74b89fb0-f200-4ae8-a3ec-dd164117f6de} WeaveService.js -contract @mozilla.org/weave/service;1 {74b89fb0-f200-4ae8-a3ec-dd164117f6de} -category app-startup WeaveService service,@mozilla.org/weave/service;1 - -# WeaveService.js (about:sync-log) -component {d28f8a0b-95da-48f4-b712-caf37097be41} WeaveService.js -contract @mozilla.org/network/protocol/about;1?what=sync-log {d28f8a0b-95da-48f4-b712-caf37097be41} - -# Register resource aliases -resource services-common resource://gre/modules/services-common/ -resource services-crypto resource://gre/modules/services-crypto/ -resource services-sync resource://gre/modules/services-sync/ diff --git a/components/weave/content/aboutSyncTabs-bindings.xml b/components/weave/content/aboutSyncTabs-bindings.xml deleted file mode 100644 index e6108209a..000000000 --- a/components/weave/content/aboutSyncTabs-bindings.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/components/weave/content/aboutSyncTabs.css b/components/weave/content/aboutSyncTabs.css deleted file mode 100644 index 2d71e254d..000000000 --- a/components/weave/content/aboutSyncTabs.css +++ /dev/null @@ -1,11 +0,0 @@ -/* 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/. */ - -richlistitem[type="tab"] { - -moz-binding: url(chrome://weave/content/aboutSyncTabs-bindings.xml#tab-listing); -} - -richlistitem[type="client"] { - -moz-binding: url(chrome://weave/content/aboutSyncTabs-bindings.xml#client-listing); -} diff --git a/components/weave/content/aboutSyncTabs.js b/components/weave/content/aboutSyncTabs.js deleted file mode 100644 index dafb79b9d..000000000 --- a/components/weave/content/aboutSyncTabs.js +++ /dev/null @@ -1,313 +0,0 @@ -/* 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/. */ - -var Cu = Components.utils; - -Cu.import("resource://gre/CommonUtils.jsm"); -Cu.import("resource://services-sync/main.js"); -Cu.import("resource:///modules/PlacesUIUtils.jsm"); -Cu.import("resource://gre/modules/PlacesUtils.jsm", this); -Cu.import("resource://gre/modules/Services.jsm"); -Cu.import("resource://gre/modules/XPCOMUtils.jsm"); - -var RemoteTabViewer = { - _tabsList: null, - - init: function () { - Services.obs.addObserver(this, "weave:service:login:finish", false); - Services.obs.addObserver(this, "weave:engine:sync:finish", false); - - this._tabsList = document.getElementById("tabsList"); - - this.buildList(true); - }, - - uninit: function () { - Services.obs.removeObserver(this, "weave:service:login:finish"); - Services.obs.removeObserver(this, "weave:engine:sync:finish"); - }, - - createItem: function(attrs) { - let item = document.createElement("richlistitem"); - - // Copy the attributes from the argument into the item - for (let attr in attrs) { - item.setAttribute(attr, attrs[attr]); - } - - if (attrs["type"] == "tab") { - item.label = attrs.title != "" ? attrs.title : attrs.url; - } - - return item; - }, - - filterTabs: function(event) { - let val = event.target.value.toLowerCase(); - let numTabs = this._tabsList.getRowCount(); - let clientTabs = 0; - let currentClient = null; - - for (let i = 0; i < numTabs; i++) { - let item = this._tabsList.getItemAtIndex(i); - let hide = false; - if (item.getAttribute("type") == "tab") { - if (!item.getAttribute("url").toLowerCase().includes(val) && - !item.getAttribute("title").toLowerCase().includes(val)) { - hide = true; - } else { - clientTabs++; - } - } - else if (item.getAttribute("type") == "client") { - if (currentClient) { - if (clientTabs == 0) { - currentClient.hidden = true; - } - } - currentClient = item; - clientTabs = 0; - } - item.hidden = hide; - } - if (clientTabs == 0) { - currentClient.hidden = true; - } - }, - - openSelected: function() { - let items = this._tabsList.selectedItems; - let urls = []; - for (let i = 0;i < items.length;i++) { - if (items[i].getAttribute("type") == "tab") { - urls.push(items[i].getAttribute("url")); - let index = this._tabsList.getIndexOfItem(items[i]); - this._tabsList.removeItemAt(index); - } - } - if (urls.length) { - getTopWin().gBrowser.loadTabs(urls); - this._tabsList.clearSelection(); - } - }, - - bookmarkSingleTab: function() { - let item = this._tabsList.selectedItems[0]; - let uri = Weave.Utils.makeURI(item.getAttribute("url")); - let title = item.getAttribute("title"); - PlacesUIUtils.showBookmarkDialog({ action: "add" - , type: "bookmark" - , uri: uri - , title: title - , hiddenRows: [ "description" - , "location" - , "loadInSidebar" - , "keyword" ] - }, window.top); - }, - - bookmarkSelectedTabs: function() { - let items = this._tabsList.selectedItems; - let URIs = []; - for (let i = 0;i < items.length;i++) { - if (items[i].getAttribute("type") == "tab") { - let uri = Weave.Utils.makeURI(items[i].getAttribute("url")); - if (!uri) { - continue; - } - - URIs.push(uri); - } - } - if (URIs.length) { - PlacesUIUtils.showBookmarkDialog({ action: "add" - , type: "folder" - , URIList: URIs - , hiddenRows: [ "description" ] - }, window.top); - } - }, - - getIcon: function (iconUri, defaultIcon) { - try { - let iconURI = Weave.Utils.makeURI(iconUri); - return PlacesUtils.favicons.getFaviconLinkForIcon(iconURI).spec; - } catch (ex) { - // Do nothing. - } - - // Just give the provided default icon or the system's default. - return defaultIcon || PlacesUtils.favicons.defaultFavicon.spec; - }, - - _waitingForBuildList: false, - - _buildListRequested: false, - - buildList: function (force) { - if (this._waitingForBuildList) { - this._buildListRequested = true; - return; - } - - this._waitingForBuildList = true; - this._buildListRequested = false; - - this._clearTabList(); - - if (Weave.Service.isLoggedIn && this._refetchTabs(force)) { - this._generateWeaveTabList(); - } else { - //XXXzpao We should say something about not being logged in & not having data - // or tell the appropriate condition. (bug 583344) - } - - function complete() { - this._waitingForBuildList = false; - if (this._buildListRequested) { - CommonUtils.nextTick(this.buildList, this); - } - } - - complete(); - }, - - _clearTabList: function () { - let list = this._tabsList; - - // Clear out existing richlistitems - let count = list.getRowCount(); - if (count > 0) { - for (let i = count - 1; i >= 0; i--) { - list.removeItemAt(i); - } - } - }, - - _generateWeaveTabList: function () { - let engine = Weave.Service.engineManager.get("tabs"); - let list = this._tabsList; - - let seenURLs = new Set(); - let localURLs = engine.getOpenURLs(); - - for (let [guid, client] in Iterator(engine.getAllClients())) { - // Create the client node, but don't add it in-case we don't show any tabs - let appendClient = true; - - client.tabs.forEach(function({title, urlHistory, icon}) { - let url = urlHistory[0]; - if (!url || localURLs.has(url) || seenURLs.has(url)) { - return; - } - seenURLs.add(url); - - if (appendClient) { - let attrs = { - type: "client", - clientName: client.clientName, - class: Weave.Service.clientsEngine.isMobile(client.id) ? "mobile" : "desktop" - }; - let clientEnt = this.createItem(attrs); - list.appendChild(clientEnt); - appendClient = false; - clientEnt.disabled = true; - } - let attrs = { - type: "tab", - title: title || url, - url: url, - icon: this.getIcon(icon), - } - let tab = this.createItem(attrs); - list.appendChild(tab); - }, this); - } - }, - - adjustContextMenu: function(event) { - let mode = "all"; - switch (this._tabsList.selectedItems.length) { - case 0: - break; - case 1: - mode = "single" - break; - default: - mode = "multiple"; - break; - } - - let menu = document.getElementById("tabListContext"); - let el = menu.firstChild; - while (el) { - let showFor = el.getAttribute("showFor"); - if (showFor) { - el.hidden = showFor != mode && showFor != "all"; - } - - el = el.nextSibling; - } - }, - - _refetchTabs: function(force) { - if (!force) { - // Don't bother refetching tabs if we already did so recently - let lastFetch = 0; - try { - lastFetch = Services.prefs.getIntPref("services.sync.lastTabFetch"); - } - catch (e) { - /* Just use the default value of 0 */ - } - - let now = Math.floor(Date.now() / 1000); - if (now - lastFetch < 30) { - return false; - } - } - - // if Clients hasn't synced yet this session, we need to sync it as well. - if (Weave.Service.clientsEngine.lastSync == 0) { - Weave.Service.clientsEngine.sync(); - } - - // Force a sync only for the tabs engine - let engine = Weave.Service.engineManager.get("tabs"); - engine.lastModified = null; - engine.sync(); - Services.prefs.setIntPref("services.sync.lastTabFetch", - Math.floor(Date.now() / 1000)); - - return true; - }, - - observe: function(subject, topic, data) { - switch (topic) { - case "weave:service:login:finish": - this.buildList(true); - break; - case "weave:engine:sync:finish": - if (subject == "tabs") { - this.buildList(false); - } - break; - } - }, - - handleClick: function(event) { - if (event.target.getAttribute("type") != "tab") { - return; - } - - - if (event.button == 1) { - let url = event.target.getAttribute("url"); - openUILink(url, event); - let index = this._tabsList.getIndexOfItem(event.target); - this._tabsList.removeItemAt(index); - } - } -} - diff --git a/components/weave/content/aboutSyncTabs.xul b/components/weave/content/aboutSyncTabs.xul deleted file mode 100644 index 2300c0b42..000000000 --- a/components/weave/content/aboutSyncTabs.xul +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - %aboutSyncTabsDTD; -]> - - -