Mholloway has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/352965 )
Change subject: Update CsrfTokenClient to use formatversion=2
......................................................................
Update CsrfTokenClient to use formatversion=2
+ minor hygienic changes
Bug: T150382
Change-Id: I203492eb81c8476a29ce7c134f39dbbfaeb48b4a
---
M app/src/main/java/org/wikipedia/csrf/CsrfTokenClient.java
M app/src/test/java/org/wikipedia/csrf/CsrfTokenClientTest.java
R app/src/test/res/raw/csrf_token.json
3 files changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/65/352965/1
diff --git a/app/src/main/java/org/wikipedia/csrf/CsrfTokenClient.java
b/app/src/main/java/org/wikipedia/csrf/CsrfTokenClient.java
index cfedeba..04c00f0 100644
--- a/app/src/main/java/org/wikipedia/csrf/CsrfTokenClient.java
+++ b/app/src/main/java/org/wikipedia/csrf/CsrfTokenClient.java
@@ -163,7 +163,7 @@
}
@VisibleForTesting interface Service {
- @GET("w/api.php?action=query&format=json&meta=tokens&type=csrf")
+
@GET("w/api.php?action=query&format=json&formatversion=2&meta=tokens&type=csrf")
Call<MwQueryResponse<CsrfToken>> request();
}
}
diff --git a/app/src/test/java/org/wikipedia/csrf/CsrfTokenClientTest.java
b/app/src/test/java/org/wikipedia/csrf/CsrfTokenClientTest.java
index f9bdf09..88dc7e9 100644
--- a/app/src/test/java/org/wikipedia/csrf/CsrfTokenClientTest.java
+++ b/app/src/test/java/org/wikipedia/csrf/CsrfTokenClientTest.java
@@ -30,7 +30,7 @@
@Test public void testRequestSuccess() throws Throwable {
User.clearUser();
String expected = "b6f7bd58c013ab30735cb19ecc0aa08258122cba+\\";
- enqueueFromFile("edittoken.json");
+ enqueueFromFile("csrf_token.json");
Callback cb = mock(Callback.class);
request(cb);
diff --git a/app/src/test/res/raw/edittoken.json
b/app/src/test/res/raw/csrf_token.json
similarity index 81%
rename from app/src/test/res/raw/edittoken.json
rename to app/src/test/res/raw/csrf_token.json
index 47df3da..2b27097 100644
--- a/app/src/test/res/raw/edittoken.json
+++ b/app/src/test/res/raw/csrf_token.json
@@ -1,5 +1,5 @@
{
- "batchcomplete": "",
+ "batchcomplete": true,
"query": {
"tokens": {
"csrftoken": "b6f7bd58c013ab30735cb19ecc0aa08258122cba+\\"
--
To view, visit https://gerrit.wikimedia.org/r/352965
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I203492eb81c8476a29ce7c134f39dbbfaeb48b4a
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mholloway <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
