wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-09-26 02:17:34 +09:00
Code Issues Projects Releases Packages Wiki Activity

Issue #1053 - Remove android support from netwerk

Browse source
This commit is contained in:
Matt A. Tobin 2020-02-22 20:10:23 -05:00 • committed by Roy Tam
commit 93a435ae22
31 changed files with 16 additions and 1404 deletions
Download patch file Download diff file Expand all files Collapse all files

7
netwerk/protocol/http/UserAgentUpdates.jsm
View file

@ -143,14 +143,9 @@ this.UserAgentUpdates = {
// try to load next one if the previous load failed
return prevLoad ? prevLoad.then(null, tryNext) : tryNext();
}, null).then(null, (ex) => {
#ifdef MOZ_WIDGET_ANDROID
// Make one last attempt to read from the Fennec APK root.
return readChannel("resource://android/" + FILE_UPDATES);
#else
// All previous (non-Android) load attempts have failed, so we bail.
// All previous load attempts have failed, so we bail.
throw new Error("UserAgentUpdates: Failed to load " + FILE_UPDATES +
ex + "\n" + ex.stack);
#endif
}).then((update) => {
// Apply update if loading was successful
this._applyUpdate(update);

28
netwerk/protocol/http/nsHttpHandler.cpp
View file

@ -127,30 +127,6 @@ NewURI(const nsACString &aSpec,
return NS_OK;
}
#ifdef ANDROID
static nsCString
GetDeviceModelId() {
// Assumed to be running on the main thread
// We need the device property in either case
nsAutoCString deviceModelId;
nsCOMPtr<nsIPropertyBag2> infoService = do_GetService("@mozilla.org/system-info;1");
MOZ_ASSERT(infoService, "Could not find a system info service");
nsAutoString androidDevice;
nsresult rv = infoService->GetPropertyAsAString(NS_LITERAL_STRING("device"), androidDevice);
if (NS_SUCCEEDED(rv)) {
deviceModelId = NS_LossyConvertUTF16toASCII(androidDevice);
}
nsAutoCString deviceString;
rv = Preferences::GetCString(UA_PREF("device_string"), &deviceString);
if (NS_SUCCEEDED(rv)) {
deviceString.Trim(" ", true, true);
deviceString.ReplaceSubstring(NS_LITERAL_CSTRING("%DEVICEID%"), deviceModelId);
return deviceString;
}
return deviceModelId;
}
#endif
//-----------------------------------------------------------------------------
// nsHttpHandler <public>
//-----------------------------------------------------------------------------
@ -792,9 +768,7 @@ nsHttpHandler::InitUserAgentComponents()
#ifndef MOZ_UA_OS_AGNOSTIC
// Gather platform.
mPlatform.AssignLiteral(
#if defined(ANDROID)
"Android"
#elif defined(XP_WIN)
#if defined(XP_WIN)
"Windows"
#elif defined(XP_MACOSX)
"Macintosh"