mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1671571 - Don't pass null headers in Loader. r=snorp 

Differential Revision: https://phabricator.services.mozilla.com/D93811
This commit is contained in:
Agi Sferro 2020-10-19 15:45:17 +00:00
Родитель 8b6f27b098
Коммит 640b96f85b
1 изменённых файлов: 40 добавлений и 15 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

55
mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoSession.java
Просмотреть файл

@ -1765,10 +1765,15 @@ public class GeckoSession {
@AnyThread
@Deprecated
public void loadUri(final @NonNull String uri, final @Nullable Map<String, String> additionalHeaders) {
load(new Loader()
final Loader loader = new Loader()
.uri(uri)
.headerFilter(HEADER_FILTER_UNRESTRICTED_UNSAFE)
.additionalHeaders(additionalHeaders));
.headerFilter(HEADER_FILTER_UNRESTRICTED_UNSAFE);
if (additionalHeaders != null) {
loader.additionalHeaders(additionalHeaders);
}
load(loader);
}
/**
@ -1819,12 +1824,17 @@ public class GeckoSession {
@Deprecated
public void loadUri(final @NonNull String uri, final @Nullable String referrer,
final @LoadFlags int flags, final @Nullable Map<String, String> additionalHeaders) {
load(new Loader()
final Loader loader = new Loader()
.uri(uri)
.headerFilter(HEADER_FILTER_UNRESTRICTED_UNSAFE)
.referrer(referrer)
.flags(flags)
.additionalHeaders(additionalHeaders));
.flags(flags);
if (additionalHeaders != null) {
loader.additionalHeaders(additionalHeaders);
}
load(loader);
}
/**
@ -1863,12 +1873,17 @@ public class GeckoSession {
@Deprecated
public void loadUri(final @NonNull String uri, final @Nullable GeckoSession referrer,
final @LoadFlags int flags, final @Nullable Map<String, String> additionalHeaders) {
load(new Loader()
final Loader loader = new Loader()
.uri(uri)
.headerFilter(HEADER_FILTER_UNRESTRICTED_UNSAFE)
.referrer(referrer)
.additionalHeaders(additionalHeaders)
.flags(flags));
.flags(flags);
if (additionalHeaders != null) {
loader.additionalHeaders(additionalHeaders);
}
load(loader);
}
private GeckoResult<AllowOrDeny> shouldLoadUri(final NavigationDelegate.LoadRequest request) {
@ -1918,10 +1933,15 @@ public class GeckoSession {
@AnyThread
@Deprecated
public void loadUri(final @NonNull Uri uri, final @Nullable Map<String, String> additionalHeaders) {
load(new Loader()
final Loader loader = new Loader()
.uri(uri)
.headerFilter(HEADER_FILTER_UNRESTRICTED_UNSAFE)
.additionalHeaders(additionalHeaders));
.headerFilter(HEADER_FILTER_UNRESTRICTED_UNSAFE);
if (additionalHeaders != null) {
loader.additionalHeaders(additionalHeaders);
}
load(loader);
}
/**
@ -1969,12 +1989,17 @@ public class GeckoSession {
@Deprecated
public void loadUri(final @NonNull Uri uri, final @Nullable Uri referrer,
final @LoadFlags int flags, final @Nullable Map<String, String> additionalHeaders) {
load(new Loader()
final Loader loader = new Loader()
.uri(uri)
.headerFilter(HEADER_FILTER_UNRESTRICTED_UNSAFE)
.referrer(referrer)
.flags(flags)
.additionalHeaders(additionalHeaders));
.flags(flags);
if (additionalHeaders != null) {
loader.additionalHeaders(additionalHeaders);
}
load(loader);
}
/**