Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-17 22:32:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1374574 - Remove the FlyWeb system add-on from Fennec. r=ahunt,sebastian

Browse Source 
MozReview-Commit-ID: AyYD4HedXFv

--HG--
extra : rebase_source : 82d068d219239e2b43e1ec285f7112065642bd29
This commit is contained in:
Johann Hofmann 2017-11-22 14:49:35 +01:00
parent 2926a6c050
commit d655438426
17 changed files with 1 additions and 410 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mobile/android/app.mozbuild
View File

@ -5,9 +5,6 @@
include('/toolkit/toolkit.mozbuild')
if CONFIG['MOZ_EXTENSIONS']:
DIRS += ['/extensions']
DIRS += [
'/%s' % CONFIG['MOZ_BRANDING_DIRECTORY'],
'/mobile/android',

1
mobile/android/base/java/org/mozilla/gecko/widget/DoorHanger.java
View File

@ -52,7 +52,6 @@ public abstract class DoorHanger extends LinearLayout {
DESKTOPNOTIFICATION2,
WEBRTC,
VIBRATION,
FLYWEBPUBLISHSERVER,
ADDON
}

8
mobile/android/chrome/content/PermissionsHelper.js
View File

@ -5,8 +5,7 @@
var PermissionsHelper = {
_permissonTypes: ["password", "geolocation", "popup", "indexedDB",
"offline-app", "desktop-notification", "plugins", "native-intent",
"flyweb-publish-server"],
"offline-app", "desktop-notification", "plugins", "native-intent"],
_permissionStrings: {
"password": {
label: "password.logins",
@ -18,11 +17,6 @@ var PermissionsHelper = {
allowed: "geolocation.allow",
denied: "geolocation.dontAllow"
},
"flyweb-publish-server": {
label: "flyWebPublishServer.publishServer",
allowed: "flyWebPublishServer.allow",
denied: "flyWebPublishServer.dontAllow"
},
"popup": {
label: "blockPopups.label2",
allowed: "popup.show",

2
mobile/android/components/ContentPermissionPrompt.js
View File

@ -20,14 +20,12 @@ const kEntities = {
"contacts": "contacts",
"desktop-notification": "desktopNotification2",
"geolocation": "geolocation",
"flyweb-publish-server": "flyWebPublishServer",
};
// For these types, prompt for permission if action is unknown.
const PROMPT_FOR_UNKNOWN = [
"desktop-notification",
"geolocation",
"flyweb-publish-server",
];
function ContentPermissionPrompt() {}

153
mobile/android/extensions/flyweb/bootstrap.js vendored
View File

@ -1,153 +0,0 @@
/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
/* 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/. */
const {classes: Cc, interfaces: Ci, manager: Cm, results: Cr, utils: Cu, Constructor: CC} = Components;
Cm.QueryInterface(Ci.nsIComponentRegistrar);
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "Console",
"resource://gre/modules/Console.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "Services",
"resource://gre/modules/Services.jsm");
XPCOMUtils.defineLazyGetter(this, "gFlyWebBundle", function() {
return Services.strings.createBundle("chrome://flyweb/locale/flyweb.properties");
});
const FLYWEB_ENABLED_PREF = "dom.flyweb.enabled";
let factory, menuID;
function AboutFlyWeb() {}
AboutFlyWeb.prototype = Object.freeze({
classDescription: "About page for displaying nearby FlyWeb services",
contractID: "@mozilla.org/network/protocol/about;1?what=flyweb",
classID: Components.ID("{baa04ff0-08b5-11e6-a837-0800200c9a66}"),
QueryInterface: XPCOMUtils.generateQI([Ci.nsIAboutModule]),
getURIFlags: function(aURI) {
return Ci.nsIAboutModule.ALLOW_SCRIPT;
},
newChannel: function(aURI, aLoadInfo) {
let uri = Services.io.newURI("chrome://flyweb/content/aboutFlyWeb.xhtml");
let channel = Services.io.newChannelFromURIWithLoadInfo(uri, aLoadInfo);
channel.originalURI = aURI;
return channel;
}
});
function Factory(component) {
this.createInstance = function(outer, iid) {
if (outer) {
throw Cr.NS_ERROR_NO_AGGREGATION;
}
return new component();
};
this.register = function() {
Cm.registerFactory(component.prototype.classID, component.prototype.classDescription, component.prototype.contractID, this);
};
this.unregister = function() {
Cm.unregisterFactory(component.prototype.classID, this);
};
Object.freeze(this);
this.register();
}
let windowListener = {
onOpenWindow: function(aWindow) {
// Wait for the window to finish loading
let domWindow = aWindow.QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIDOMWindow);
domWindow.addEventListener("UIReady", function() {
loadIntoWindow(domWindow);
}, {once: true});
},
onCloseWindow: function(aWindow) {},
onWindowTitleChange: function(aWindow, aTitle) {}
};
let FlyWebUI = {
init() {
factory = new Factory(AboutFlyWeb);
// Load into any existing windows
let windows = Services.wm.getEnumerator("navigator:browser");
while (windows.hasMoreElements()) {
let domWindow = windows.getNext().QueryInterface(Ci.nsIDOMWindow);
loadIntoWindow(domWindow);
}
// Load into any new windows
Services.wm.addListener(windowListener);
},
uninit() {
factory.unregister();
// Stop listening for new windows
Services.wm.removeListener(windowListener);
// Unload from any existing windows
let windows = Services.wm.getEnumerator("navigator:browser");
while (windows.hasMoreElements()) {
let domWindow = windows.getNext().QueryInterface(Ci.nsIDOMWindow);
unloadFromWindow(domWindow);
}
}
};
function loadIntoWindow(aWindow) {
menuID = aWindow.NativeWindow.menu.add({
name: gFlyWebBundle.GetStringFromName("flyweb-menu.name"),
callback() {
aWindow.BrowserApp.addTab("about:flyweb");
}
});
}
function unloadFromWindow(aWindow) {
if (!aWindow) {
return;
}
aWindow.NativeWindow.menu.remove(menuID);
}
function prefObserver(aSubject, aTopic, aData) {
let enabled = Services.prefs.getBoolPref(FLYWEB_ENABLED_PREF);
if (enabled) {
FlyWebUI.init();
} else {
FlyWebUI.uninit();
}
}
function install(aData, aReason) {}
function uninstall(aData, aReason) {}
function startup(aData, aReason) {
// Observe pref changes and enable/disable as necessary.
Services.prefs.addObserver(FLYWEB_ENABLED_PREF, prefObserver);
// Only initialize if pref is enabled.
let enabled = Services.prefs.getBoolPref(FLYWEB_ENABLED_PREF);
if (enabled) {
FlyWebUI.init();
}
}
function shutdown(aData, aReason) {
Services.prefs.removeObserver(FLYWEB_ENABLED_PREF, prefObserver);
let enabled = Services.prefs.getBoolPref(FLYWEB_ENABLED_PREF);
if (enabled) {
FlyWebUI.uninit();
}
}

29
mobile/android/extensions/flyweb/content/aboutFlyWeb.css
View File

@ -1,29 +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/. */
include "defines.css"
.list-item > a {
color: inherit;
text-decoration: none;
}
.details {
-moz-margin-start: calc(var(--icon-size) + var(--icon-margin) * 2 - 1em);
padding: 1em;
}
#flyweb-item-template {
display: none;
}
#flyweb-list-empty {
display: none;
}
#flyweb-list:empty + #flyweb-list-empty {
display: block;
text-align: center;
padding-top: 3.9em;
}

73
mobile/android/extensions/flyweb/content/aboutFlyWeb.js
View File

@ -1,73 +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/. */
"use strict";
const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
Cu.import("resource://gre/modules/Console.jsm");
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "Services", "resource://gre/modules/Services.jsm");
XPCOMUtils.defineLazyGetter(this, "gFlyWebBundle", function() {
return Services.strings.createBundle("chrome://flyweb/locale/flyweb.properties");
});
let discoveryManager = new FlyWebDiscoveryManager();
let discoveryCallback = {
onDiscoveredServicesChanged(services) {
if (!this.id) {
return;
}
let list = document.getElementById("flyweb-list");
while (list.firstChild) {
list.firstChild.remove();
}
let template = document.getElementById("flyweb-item-template");
for (let service of services) {
let item = template.cloneNode(true);
item.removeAttribute("id");
item.setAttribute("data-service-id", service.serviceId);
item.querySelector(".title").setAttribute("value", service.displayName);
item.querySelector(".icon").src = "chrome://flyweb/content/icon-64.png";
list.appendChild(item);
}
},
start() {
this.id = discoveryManager.startDiscovery(this);
},
stop() {
discoveryManager.stopDiscovery(this.id);
this.id = undefined;
}
};
window.addEventListener("DOMContentLoaded", () => {
let list = document.getElementById("flyweb-list");
list.addEventListener("click", (evt) => {
let serviceId = evt.target.closest("[data-service-id]").getAttribute("data-service-id");
discoveryManager.pairWithService(serviceId, {
pairingSucceeded(service) {
window.open(service.uiUrl, "FlyWebWindow_" + serviceId);
},
pairingFailed(error) {
console.error("FlyWeb failed to connect to service " + serviceId, error);
}
});
});
discoveryCallback.start();
});
window.addEventListener("unload", () => {
discoveryCallback.stop();
});

47
mobile/android/extensions/flyweb/content/aboutFlyWeb.xhtml
View File

@ -1,47 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd" [
<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
%brandDTD;
<!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd" >
%globalDTD;
<!ENTITY % flywebDTD SYSTEM "chrome://flyweb/locale/aboutFlyWeb.dtd" >
%flywebDTD;
]>
<!-- 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/. -->
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<head>
<title>&aboutFlyWeb.title;</title>
<meta name="viewport" content="width=device-width; user-scalable=0" />
<link rel="icon" type="image/png" sizes="64x64" href="chrome://branding/content/favicon64.png" />
<link rel="stylesheet" href="chrome://browser/skin/aboutBase.css" type="text/css"/>
<link rel="stylesheet" href="chrome://flyweb/content/aboutFlyWeb.css" type="text/css"/>
</head>
<body dir="&locale.dir;">
<!--template id="flyweb-item-template"-->
<li id="flyweb-item-template" class="list-item" role="button">
<img class="icon" src=""/>
<div class="details">
<div class="row">
<!-- This is a hack so that we can crop this label in its center -->
<xul:label class="title" crop="center" value=""/>
</div>
</div>
</li>
<!--/template-->
<div class="header">
<div>&aboutFlyWeb.header;</div>
</div>
<ul id="flyweb-list" class="list"></ul>
<span id="flyweb-list-empty">&aboutFlyWeb.empty;</span>
<script type="application/javascript" src="chrome://flyweb/content/aboutFlyWeb.js"/>
</body>
</html>

BIN
mobile/android/extensions/flyweb/content/icon-64.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.3 KiB

31
mobile/android/extensions/flyweb/install.rdf.in
View File

@ -1,31 +0,0 @@
<?xml version="1.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/. -->
#filter substitution
<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:em="http://www.mozilla.org/2004/em-rdf#">
<Description about="urn:mozilla:install-manifest">
<em:id>flyweb@mozilla.org</em:id>
<em:version>1.0.0</em:version>
<em:type>2</em:type>
<em:bootstrap>true</em:bootstrap>
<!-- Target Application this theme can install into,
with minimum and maximum supported versions. -->
<em:targetApplication>
<Description>
<em:id>{aa3c5121-dab2-40e2-81ca-7ea25febc110}</em:id>
<em:minVersion>@FIREFOX_VERSION@</em:minVersion>
<em:maxVersion>@FIREFOX_VERSION@</em:maxVersion>
</Description>
</em:targetApplication>
<!-- Front End MetaData -->
<em:name>FlyWeb</em:name>
<em:description>Discover nearby services in the browser</em:description>
</Description>
</RDF>

10
mobile/android/extensions/flyweb/jar.mn
View File

@ -1,10 +0,0 @@
#filter substitution
# 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/.
[features/flyweb@mozilla.org] chrome.jar:
% content flyweb %content/ contentaccessible=yes
content/ (content/*)
% locale flyweb en-US %locale/en-US/
locale/ (locale/*)

7
mobile/android/extensions/flyweb/locale/en-US/aboutFlyWeb.dtd
View File

@ -1,7 +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/. -->
<!ENTITY aboutFlyWeb.title "FlyWeb">
<!ENTITY aboutFlyWeb.header "Nearby FlyWeb Services">
<!ENTITY aboutFlyWeb.empty "No FlyWeb Services Found">

5
mobile/android/extensions/flyweb/locale/en-US/flyweb.properties
View File

@ -1,5 +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/.
flyweb-menu.name = FlyWeb

15
mobile/android/extensions/flyweb/moz.build
View File

@ -1,15 +0,0 @@
# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
# vim: set filetype=python:
# 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/.
FINAL_TARGET_FILES.features['flyweb@mozilla.org'] += [
'bootstrap.js'
]
FINAL_TARGET_PP_FILES.features['flyweb@mozilla.org'] += [
'install.rdf.in'
]
JAR_MANIFESTS += ['jar.mn']

14
mobile/android/extensions/moz.build
View File

@ -1,14 +0,0 @@
# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
# vim: set filetype=python:
# 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/.
with Files('**'):
BUG_COMPONENT = ('Firefox for Android', 'General')
# Only include the following system add-ons if building Aurora or Nightly
if not CONFIG['RELEASE_OR_BETA']:
DIRS += [
'flyweb',
]

12
mobile/android/locales/en-US/chrome/browser.properties
View File

@ -214,18 +214,6 @@ desktopNotification2.ask=Would you like to receive notifications from this site?
# used in site settings dialog.
desktopNotification.notifications=Notifications
# FlyWeb UI
# LOCALIZATION NOTE (flyWebPublishServer.allow): This is an experimental feature only shipping in Nightly, and doesn't need translation.
flyWebPublishServer.allow=Allow
# LOCALIZATION NOTE (flyWebPublishServer.dontAllow): This is an experimental feature only shipping in Nightly, and doesn't need translation.
flyWebPublishServer.dontAllow=Deny
# LOCALIZATION NOTE (flyWebPublishServer.ask): This is an experimental feature only shipping in Nightly, and doesn't need translation.
flyWebPublishServer.ask=Would you like to let this site start a server accessible to nearby devices and people?
# LOCALIZATION NOTE (flyWebPublishServer.dontAskAgain): This is an experimental feature only shipping in Nightly, and doesn't need translation.
flyWebPublishServer.dontAskAgain=Don't ask again for this site
# LOCALIZATION NOTE (flyWebPublishServer.publishServer): This is an experimental feature only shipping in Nightly, and doesn't need translation.
flyWebPublishServer.publishServer=Publish Server
# Imageblocking
imageblocking.downloadedImage=Image unblocked
imageblocking.showAllImages=Show All

1
mobile/android/moz.build
View File

@ -58,7 +58,6 @@ DIRS += [
'base',
'chrome',
'components',
'extensions',
'modules',
'themes/core',
'themes/geckoview',