jenkins-bot has submitted this change and it was merged.
Change subject: Share cookies with meta, fix meta language header
......................................................................
Share cookies with meta, fix meta language header
• Share Wikipedia and Wikimedia site cookies. This will allow us to
use meta.wikimedia.org with the login cookies from en.wikipedia.org,
for example.
• Note that meta is not a language and don't send it in the
Accept-Language header.
Change-Id: I13f5efb0a1bf9fbfe0e9798ef0fa3ec3010175f2
---
M app/src/main/java/org/wikipedia/SharedPreferenceCookieManager.java
M app/src/main/java/org/wikipedia/Site.java
M app/src/main/java/org/wikipedia/WikipediaApp.java
3 files changed, 10 insertions(+), 6 deletions(-)
Approvals:
BearND: Looks good to me, approved
jenkins-bot: Verified
diff --git a/app/src/main/java/org/wikipedia/SharedPreferenceCookieManager.java
b/app/src/main/java/org/wikipedia/SharedPreferenceCookieManager.java
index ba6cd77..b6c8c18 100644
--- a/app/src/main/java/org/wikipedia/SharedPreferenceCookieManager.java
+++ b/app/src/main/java/org/wikipedia/SharedPreferenceCookieManager.java
@@ -43,9 +43,11 @@
for (String domainSpec: cookieJar.keySet()) {
// Very weak domain matching.
- // Primarily to make sure that cookies set for .wikipedia.org are
sent for en.wikipedia.org
+ // Primarily to make sure that cookies set for .wikipedia.org are
sent for
+ // en.wikipedia.org and *.wikimedia.org
// FIXME: Whitelist the domains we accept cookies from/send
cookies to. SECURITY!!!1
- if (domain.endsWith(domainSpec)) {
+ if (domain.endsWith(domainSpec)
+ || (domain.endsWith(".wikimedia.org") &&
domainSpec.endsWith(".wikipedia.org"))) {
cookiesList.addAll(makeCookieList(cookieJar.get(domainSpec)));
}
}
diff --git a/app/src/main/java/org/wikipedia/Site.java
b/app/src/main/java/org/wikipedia/Site.java
index 98abee3..f2615c0 100644
--- a/app/src/main/java/org/wikipedia/Site.java
+++ b/app/src/main/java/org/wikipedia/Site.java
@@ -16,7 +16,7 @@
public class Site implements Parcelable {
private final String domain;
- private final String languageCode;
+ private final String languageCode; // or meta
public Site(String domain) {
this(domain, urlToLanguage(domain));
diff --git a/app/src/main/java/org/wikipedia/WikipediaApp.java
b/app/src/main/java/org/wikipedia/WikipediaApp.java
index 043e76d..11a1689 100644
--- a/app/src/main/java/org/wikipedia/WikipediaApp.java
+++ b/app/src/main/java/org/wikipedia/WikipediaApp.java
@@ -215,9 +215,11 @@
*/
@NonNull
public String getAcceptLanguage(@Nullable Site site) {
- return AcceptLanguageUtil.getAcceptLanguage(
- site == null ? "" : emptyIfNull(site.getLanguageCode()),
- emptyIfNull(getAppLanguageCode()),
appLanguageState.getSystemLanguageCode());
+ String siteLang = site == null || "meta".equals(site.getLanguageCode())
+ ? ""
+ : emptyIfNull(site.getLanguageCode());
+ return AcceptLanguageUtil.getAcceptLanguage(siteLang,
emptyIfNull(getAppLanguageCode()),
+ appLanguageState.getSystemLanguageCode());
}
public Api getAPIForSite(Site site) {
--
To view, visit https://gerrit.wikimedia.org/r/270418
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I13f5efb0a1bf9fbfe0e9798ef0fa3ec3010175f2
Gerrit-PatchSet: 5
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Niedzielski <[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: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
