jenkins-bot has submitted this change and it was merged.
Change subject: Send DNT header if opted out of event logging.
......................................................................
Send DNT header if opted out of event logging.
Bug: T108955
Change-Id: I473158b5f71ef63749d380c3b9cc4aa73ede0c40
---
M app/src/main/java/org/wikipedia/WikipediaApp.java
1 file changed, 7 insertions(+), 12 deletions(-)
Approvals:
Sniedzielski: Looks good to me, approved
jenkins-bot: Verified
diff --git a/app/src/main/java/org/wikipedia/WikipediaApp.java
b/app/src/main/java/org/wikipedia/WikipediaApp.java
index ba80b74..6373d35 100644
--- a/app/src/main/java/org/wikipedia/WikipediaApp.java
+++ b/app/src/main/java/org/wikipedia/WikipediaApp.java
@@ -528,32 +528,27 @@
return simpleDateFormat;
}
- /** For Retrofit requests. Keep in sync with #buildCustomHeaders */
+ /** For Retrofit requests. */
public void injectCustomHeaders(RequestInterceptor.RequestFacade request,
Site site) {
- request.addHeader("User-Agent", getUserAgent());
-
- // Add the app install ID to the header, but only if the user has not
opted out of logging
- if (isEventLoggingEnabled()) {
- request.addHeader("X-WMF-UUID", getAppInstallID());
+ HashMap<String, String> headers =
buildCustomHeaders(getAcceptLanguage(site));
+ for (String key : headers.keySet()) {
+ request.addHeader(key, headers.get(key));
}
-
- request.addHeader("Accept-Language", getAcceptLanguage(site));
}
/** For java-mwapi API requests. */
private HashMap<String, String> buildCustomHeaders(String acceptLanguage) {
- //
https://lists.wikimedia.org/pipermail/wikimedia-l/2014-April/071131.html
HashMap<String, String> headers = new HashMap<>();
-
headers.put("User-Agent", getUserAgent());
- // Add the app install ID to the header, but only if the user has not
opted out of logging
if (isEventLoggingEnabled()) {
headers.put("X-WMF-UUID", getAppInstallID());
+ } else {
+ // Send do-not-track header if the user has opted out of event
logging
+ headers.put("DNT", "1");
}
headers.put("Accept-Language", acceptLanguage);
-
return headers;
}
--
To view, visit https://gerrit.wikimedia.org/r/264946
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I473158b5f71ef63749d380c3b9cc4aa73ede0c40
Gerrit-PatchSet: 2
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant <[email protected]>
Gerrit-Reviewer: BearND <[email protected]>
Gerrit-Reviewer: Brion VIBBER <[email protected]>
Gerrit-Reviewer: Dbrant <[email protected]>
Gerrit-Reviewer: Mholloway <[email protected]>
Gerrit-Reviewer: Niedzielski <[email protected]>
Gerrit-Reviewer: Sniedzielski <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
