[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Update EditPreviewClient to use formatversion=2

[Mholloway (Code Review)]

Mholloway has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/352976 )

Change subject: Update EditPreviewClient to use formatversion=2
......................................................................

Update EditPreviewClient to use formatversion=2

Bug: T150382
Change-Id: I53dae8216f8c01a8c1c8c618f8a731b96ea72bdb
---
M app/src/main/java/org/wikipedia/edit/preview/EditPreview.java
M app/src/main/java/org/wikipedia/edit/preview/EditPreviewClient.java
M app/src/test/res/raw/edit_preview.json
3 files changed, 8 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/76/352976/1

diff --git a/app/src/main/java/org/wikipedia/edit/preview/EditPreview.java 
b/app/src/main/java/org/wikipedia/edit/preview/EditPreview.java
index b416be8..ca25cb2 100644
--- a/app/src/main/java/org/wikipedia/edit/preview/EditPreview.java
+++ b/app/src/main/java/org/wikipedia/edit/preview/EditPreview.java
@@ -15,20 +15,15 @@
     }
 
     @Nullable String result() {
-        return parse != null ? parse.text().result() : null;
+        return parse != null ? parse.text() : null;
     }
 
     private static class Parse {
-        @SuppressWarnings("unused,NullableProblems") @NonNull private Text 
text;
-        @NonNull Text text() {
+        @SuppressWarnings("unused,NullableProblems") @NonNull private String 
title;
+        @SuppressWarnings("unused") @SerializedName("pageid") private int 
pageId;
+        @SuppressWarnings("unused,NullableProblems") @NonNull private String 
text;
+        @NonNull String text() {
             return text;
-        }
-    }
-
-    private static class Text {
-        @SuppressWarnings("unused,NullableProblems") @SerializedName("*") 
@NonNull private String result;
-        @NonNull String result() {
-            return result;
         }
     }
 }
diff --git 
a/app/src/main/java/org/wikipedia/edit/preview/EditPreviewClient.java 
b/app/src/main/java/org/wikipedia/edit/preview/EditPreviewClient.java
index 775a76c..377a8c7 100644
--- a/app/src/main/java/org/wikipedia/edit/preview/EditPreviewClient.java
+++ b/app/src/main/java/org/wikipedia/edit/preview/EditPreviewClient.java
@@ -57,7 +57,8 @@
 
     @VisibleForTesting interface Service {
         @FormUrlEncoded
-        
@POST("w/api.php?action=parse&format=json&sectionpreview=true&pst=true&mobileformat=true&prop=text")
+        
@POST("w/api.php?action=parse&format=json&formatversion=2&sectionpreview=true&pst=true"
+                + "&mobileformat=true&prop=text")
         Call<EditPreview> previewEdit(@NonNull @Field("title") String title,
                                       @NonNull @Field("text") String text);
     }
diff --git a/app/src/test/res/raw/edit_preview.json 
b/app/src/test/res/raw/edit_preview.json
index 8162898..7ccc8da 100644
--- a/app/src/test/res/raw/edit_preview.json
+++ b/app/src/test/res/raw/edit_preview.json
@@ -2,8 +2,6 @@
   "parse": {
     "title": "User:Mhollo/sandbox",
     "pageid": 46498401,
-    "text": {
-      "*": "<div class=\"mf-section-0\" 
id=\"mf-section-0\"><p>\\o/\\n\\ntest12\\n\\n3</p>\n\n\n\n\n</div>"
-    }
+    "text": "<div class=\"mf-section-0\" 
id=\"mf-section-0\"><p>\\o/\\n\\ntest12\\n\\n3</p>\n\n\n\n\n</div>"
   }
 }
\ No newline at end of file

-- 
To view, visit https://gerrit.wikimedia.org/r/352976
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I53dae8216f8c01a8c1c8c618f8a731b96ea72bdb
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mholloway <mhollo...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits