mirror of
https://github.com/ironfox-oss/IronFox.git
synced 2026-01-28 07:56:04 -05:00
212 lines
8.9 KiB
Diff
212 lines
8.9 KiB
Diff
diff --git a/docshell/base/nsAboutRedirector.cpp b/docshell/base/nsAboutRedirector.cpp
|
|
index df5658c723..659a2a589d 100644
|
|
--- a/docshell/base/nsAboutRedirector.cpp
|
|
+++ b/docshell/base/nsAboutRedirector.cpp
|
|
@@ -201,8 +201,8 @@ static const RedirEntry kRedirMap[] = {
|
|
# endif
|
|
nsIAboutModule::ALLOW_SCRIPT},
|
|
#endif
|
|
- {"telemetry", "chrome://global/content/aboutTelemetry.xhtml",
|
|
- nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::IS_SECURE_CHROME_UI},
|
|
+// {"telemetry", "chrome://global/content/aboutTelemetry.xhtml",
|
|
+// nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::IS_SECURE_CHROME_UI},
|
|
{"translations", "chrome://global/content/translations/translations.html",
|
|
nsIAboutModule::ALLOW_SCRIPT |
|
|
nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
|
|
diff --git a/docshell/build/components.conf b/docshell/build/components.conf
|
|
index 34e06ce332..906db3732c 100644
|
|
--- a/docshell/build/components.conf
|
|
+++ b/docshell/build/components.conf
|
|
@@ -29,7 +29,7 @@ about_pages = [
|
|
'serviceworkers',
|
|
'srcdoc',
|
|
'support',
|
|
- 'telemetry',
|
|
+# 'telemetry',
|
|
'translations',
|
|
'url-classifier',
|
|
'webrtc',
|
|
diff --git a/mobile/android/moz.configure b/mobile/android/moz.configure
|
|
index 0e2a6efdc9..c931fb3c74 100644
|
|
--- a/mobile/android/moz.configure
|
|
+++ b/mobile/android/moz.configure
|
|
@@ -112,7 +112,7 @@ set_config("MOZ_ANDROID_DEBUGGABLE", android_debuggable)
|
|
|
|
|
|
imply_option("MOZ_NORMANDY", False)
|
|
-imply_option("MOZ_SERVICES_HEALTHREPORT", True)
|
|
+imply_option("MOZ_SERVICES_HEALTHREPORT", False)
|
|
imply_option("MOZ_GECKOVIEW_HISTORY", True)
|
|
|
|
imply_option("MOZ_APP_UA_NAME", "Firefox")
|
|
diff --git a/toolkit/components/glean/src/init/mod.rs b/toolkit/components/glean/src/init/mod.rs
|
|
index 42c16ebb87..4f27d1ed09 100644
|
|
--- a/toolkit/components/glean/src/init/mod.rs
|
|
+++ b/toolkit/components/glean/src/init/mod.rs
|
|
@@ -72,7 +72,7 @@ pub extern "C" fn fog_init(
|
|
disable_internal_pings: bool,
|
|
) -> nsresult {
|
|
// On Android always enable Glean upload.
|
|
- let upload_enabled = true;
|
|
+ let upload_enabled = false;
|
|
// Don't set up an uploader.
|
|
let uploader = None;
|
|
|
|
@@ -155,7 +155,7 @@ fn build_configuration(
|
|
if app_id_override == "thunderbird.desktop" {
|
|
String::from("https://incoming.thunderbird.net")
|
|
} else {
|
|
- String::from("https://incoming.telemetry.mozilla.org")
|
|
+ String::from("")
|
|
}
|
|
};
|
|
|
|
@@ -186,13 +186,13 @@ fn build_configuration(
|
|
delay_ping_lifetime_io: true,
|
|
server_endpoint: Some(server),
|
|
uploader: None,
|
|
- use_core_mps: true,
|
|
+ use_core_mps: false,
|
|
trim_data_to_registered_pings: true,
|
|
log_level: None,
|
|
rate_limit,
|
|
enable_event_timestamps: true,
|
|
experimentation_id: None,
|
|
- enable_internal_pings: true,
|
|
+ enable_internal_pings: false,
|
|
ping_schedule: pings::ping_schedule(),
|
|
ping_lifetime_threshold: 0,
|
|
ping_lifetime_max_time: Duration::ZERO,
|
|
@@ -374,7 +374,7 @@ fn fog_test_reset_internal(
|
|
let (mut conf, client_info) = build_configuration(data_path_override, app_id_override)?;
|
|
|
|
// On Android always enable Glean upload.
|
|
- conf.upload_enabled = true;
|
|
+ conf.upload_enabled = false;
|
|
|
|
// Don't accidentally send "main" pings during tests.
|
|
conf.use_core_mps = false;
|
|
diff --git a/toolkit/components/glean/src/init/viaduct_uploader.rs b/toolkit/components/glean/src/init/viaduct_uploader.rs
|
|
index b61d7e2036..cc8e1feb48 100644
|
|
--- a/toolkit/components/glean/src/init/viaduct_uploader.rs
|
|
+++ b/toolkit/components/glean/src/init/viaduct_uploader.rs
|
|
@@ -117,7 +117,7 @@ fn ohttp_upload(upload_request: PingUploadRequest) -> Result<UploadResult, Viadu
|
|
let ohttp_request = ohttp::ClientRequest::from_encoded_config(config)?;
|
|
let (capsule, ohttp_response) = ohttp_request.encapsulate(&binary_request)?;
|
|
|
|
- const OHTTP_RELAY_URL: &str = "https://mozilla-ohttp.fastly-edge.com/";
|
|
+ const OHTTP_RELAY_URL: &str = "";
|
|
let parsed_relay_url = Url::parse(OHTTP_RELAY_URL)?;
|
|
|
|
log::trace!("FOG ohttp uploader uploading to {}", parsed_relay_url);
|
|
@@ -148,7 +148,7 @@ fn ohttp_upload(upload_request: PingUploadRequest) -> Result<UploadResult, Viadu
|
|
|
|
fn get_config() -> Result<Vec<u8>, ViaductUploaderError> {
|
|
const OHTTP_CONFIG_URL: &str =
|
|
- "https://prod.ohttp-gateway.prod.webservices.mozgcp.net/ohttp-configs";
|
|
+ "";
|
|
log::trace!("Getting OHTTP config from {}", OHTTP_CONFIG_URL);
|
|
let parsed_config_url = Url::parse(OHTTP_CONFIG_URL)?;
|
|
Ok(Request::get(parsed_config_url).send()?.body)
|
|
diff --git a/toolkit/components/telemetry/app/TelemetryControllerBase.sys.mjs b/toolkit/components/telemetry/app/TelemetryControllerBase.sys.mjs
|
|
index cf0a7bd372..4f19716815 100644
|
|
--- a/toolkit/components/telemetry/app/TelemetryControllerBase.sys.mjs
|
|
+++ b/toolkit/components/telemetry/app/TelemetryControllerBase.sys.mjs
|
|
@@ -104,8 +104,8 @@ export var TelemetryControllerBase = Object.freeze({
|
|
const isReleaseCandidateOnBeta =
|
|
AppConstants.MOZ_UPDATE_CHANNEL === "release" &&
|
|
Services.prefs.getCharPref("app.update.channel", null) === "beta";
|
|
- Services.telemetry.canRecordBase = true;
|
|
- Services.telemetry.canRecordExtended =
|
|
+ Services.telemetry.canRecordBase = false;
|
|
+ Services.telemetry.canRecordExtended = false &&
|
|
isPrereleaseChannel ||
|
|
isReleaseCandidateOnBeta ||
|
|
Services.prefs.getBoolPref(this.Preferences.OverridePreRelease, false);
|
|
diff --git a/toolkit/components/telemetry/app/UsageReporting.sys.mjs b/toolkit/components/telemetry/app/UsageReporting.sys.mjs
|
|
index bb7e05d43b..d0e8c3476b 100644
|
|
--- a/toolkit/components/telemetry/app/UsageReporting.sys.mjs
|
|
+++ b/toolkit/components/telemetry/app/UsageReporting.sys.mjs
|
|
@@ -46,7 +46,7 @@ export var UsageReporting = {
|
|
|
|
// Usage deletion requests can always be sent. They are
|
|
// always sent in response to user action.
|
|
- GleanPings.usageDeletionRequest.setEnabled(true);
|
|
+ GleanPings.usageDeletionRequest.setEnabled(false);
|
|
|
|
// Usage pings should only be sent when upload is enabled.
|
|
// Eventually, Glean will persist this setting.
|
|
diff --git a/toolkit/components/telemetry/core/Telemetry.cpp b/toolkit/components/telemetry/core/Telemetry.cpp
|
|
index c07273a7b7..66a0191fec 100644
|
|
--- a/toolkit/components/telemetry/core/Telemetry.cpp
|
|
+++ b/toolkit/components/telemetry/core/Telemetry.cpp
|
|
@@ -895,7 +895,7 @@ NS_IMETHODIMP
|
|
TelemetryImpl::GetIsOfficialTelemetry(bool* ret) {
|
|
#if defined(MOZILLA_OFFICIAL) && defined(MOZ_TELEMETRY_REPORTING) && \
|
|
!defined(DEBUG)
|
|
- *ret = true;
|
|
+ *ret = false;
|
|
#else
|
|
*ret = false;
|
|
#endif
|
|
@@ -914,7 +914,7 @@ already_AddRefed<nsITelemetry> TelemetryImpl::CreateTelemetryInstance() {
|
|
#ifndef FUZZING
|
|
if (XRE_IsParentProcess() || XRE_IsContentProcess() || XRE_IsGPUProcess() ||
|
|
XRE_IsRDDProcess() || XRE_IsSocketProcess() || XRE_IsUtilityProcess()) {
|
|
- useTelemetry = true;
|
|
+ useTelemetry = false;
|
|
}
|
|
#endif
|
|
#ifdef MOZ_BACKGROUNDTASKS
|
|
diff --git a/toolkit/components/telemetry/core/TelemetryCommon.cpp b/toolkit/components/telemetry/core/TelemetryCommon.cpp
|
|
index a52d8e0a64..2ecdbffc98 100644
|
|
--- a/toolkit/components/telemetry/core/TelemetryCommon.cpp
|
|
+++ b/toolkit/components/telemetry/core/TelemetryCommon.cpp
|
|
@@ -50,14 +50,14 @@ bool CanRecordDataset(uint32_t aDataset, bool aCanRecordBase,
|
|
// If we are extended telemetry is enabled, we are allowed to record
|
|
// regardless of the dataset.
|
|
if (aCanRecordExtended) {
|
|
- return true;
|
|
+ return false;
|
|
}
|
|
|
|
// If base telemetry data is enabled and we're trying to record base
|
|
// telemetry, allow it.
|
|
if (aCanRecordBase &&
|
|
IsInDataset(aDataset, nsITelemetry::DATASET_ALL_CHANNELS)) {
|
|
- return true;
|
|
+ return false;
|
|
}
|
|
|
|
// We're not recording extended telemetry or this is not the base
|
|
diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
|
|
index 83fcfac2d4..82a852c15c 100644
|
|
--- a/toolkit/content/jar.mn
|
|
+++ b/toolkit/content/jar.mn
|
|
@@ -37,9 +37,9 @@ toolkit.jar:
|
|
content/global/aboutGlean.html
|
|
content/global/aboutGlean.css
|
|
#endif
|
|
- content/global/aboutTelemetry.js
|
|
- content/global/aboutTelemetry.xhtml
|
|
- content/global/aboutTelemetry.css
|
|
+# content/global/aboutTelemetry.js
|
|
+# content/global/aboutTelemetry.xhtml
|
|
+# content/global/aboutTelemetry.css
|
|
content/global/aboutUrlClassifier.js
|
|
content/global/aboutUrlClassifier.xhtml
|
|
content/global/aboutUrlClassifier.css
|
|
diff --git a/toolkit/library/rust/gkrust-features.mozbuild b/toolkit/library/rust/gkrust-features.mozbuild
|
|
index a19af5bd9d..ba8f57bb70 100644
|
|
--- a/toolkit/library/rust/gkrust-features.mozbuild
|
|
+++ b/toolkit/library/rust/gkrust-features.mozbuild
|
|
@@ -60,7 +60,7 @@ if CONFIG["MOZ_WEBRTC"]:
|
|
# We need to tell Glean it is being built with Gecko.
|
|
gkrust_features += ["glean_with_gecko"]
|
|
|
|
-if not CONFIG["MOZILLA_OFFICIAL"]:
|
|
+if not CONFIG["0"]:
|
|
gkrust_features += ["glean_disable_upload"]
|
|
|
|
if CONFIG["MOZ_ENABLE_DBUS"]:
|