[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Hygiene: clarify EditPreviewTask dependency

[Niedzielski (Code Review)]

Niedzielski has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/316376

Change subject: Hygiene: clarify EditPreviewTask dependency
......................................................................

Hygiene: clarify EditPreviewTask dependency

Change EditPreviewTask constructor parameter type instead of casting and
add @NonNull annotation to implied nonnull parameter.

Change-Id: I801eee443aac75cda6afaee733c25784e22b5f69
---
M app/src/androidTest/java/org/wikipedia/editing/EditPreviewTaskTest.java
M app/src/main/java/org/wikipedia/editing/EditPreviewFragment.java
M app/src/main/java/org/wikipedia/editing/EditPreviewTask.java
3 files changed, 10 insertions(+), 10 deletions(-)


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

diff --git 
a/app/src/androidTest/java/org/wikipedia/editing/EditPreviewTaskTest.java 
b/app/src/androidTest/java/org/wikipedia/editing/EditPreviewTaskTest.java
index 64f882c..8c0f4b4 100644
--- a/app/src/androidTest/java/org/wikipedia/editing/EditPreviewTaskTest.java
+++ b/app/src/androidTest/java/org/wikipedia/editing/EditPreviewTaskTest.java
@@ -7,10 +7,10 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.wikipedia.Site;
+import org.wikipedia.WikipediaApp;
 import org.wikipedia.page.PageTitle;
 import org.wikipedia.testlib.TestLatch;
 
-import static android.support.test.InstrumentationRegistry.getTargetContext;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsString;
 
@@ -38,7 +38,7 @@
         private String result;
 
         Subject(String wikiText, PageTitle title) {
-            super(getTargetContext(), wikiText, title);
+            super(WikipediaApp.getInstance(), wikiText, title);
         }
 
         @Override
diff --git a/app/src/main/java/org/wikipedia/editing/EditPreviewFragment.java 
b/app/src/main/java/org/wikipedia/editing/EditPreviewFragment.java
index 76f6368..068a861 100644
--- a/app/src/main/java/org/wikipedia/editing/EditPreviewFragment.java
+++ b/app/src/main/java/org/wikipedia/editing/EditPreviewFragment.java
@@ -292,7 +292,7 @@
     public void showPreview(final PageTitle title, final String wikiText) {
         hideSoftKeyboard(getActivity());
 
-        new EditPreviewTask(getActivity(), wikiText, title) {
+        new EditPreviewTask(WikipediaApp.getInstance(), wikiText, title) {
             @Override
             public void onBeforeExecute() {
                 progressDialog.show();
diff --git a/app/src/main/java/org/wikipedia/editing/EditPreviewTask.java 
b/app/src/main/java/org/wikipedia/editing/EditPreviewTask.java
index a3dd624..a5c7a54 100644
--- a/app/src/main/java/org/wikipedia/editing/EditPreviewTask.java
+++ b/app/src/main/java/org/wikipedia/editing/EditPreviewTask.java
@@ -1,21 +1,21 @@
 package org.wikipedia.editing;
 
-import android.content.Context;
+import android.support.annotation.NonNull;
+
 import org.mediawiki.api.json.Api;
 import org.mediawiki.api.json.ApiException;
 import org.mediawiki.api.json.ApiResult;
 import org.mediawiki.api.json.RequestBuilder;
 import org.wikipedia.ApiTask;
-import org.wikipedia.page.PageTitle;
 import org.wikipedia.WikipediaApp;
-
+import org.wikipedia.page.PageTitle;
 
 public class EditPreviewTask extends ApiTask<String> {
     private final String wikiText;
-    private final PageTitle title;
+    @NonNull private final PageTitle title;
 
-    public EditPreviewTask(Context context, String wikiText, PageTitle title) {
-        
super(((WikipediaApp)context.getApplicationContext()).getAPIForSite(title.getSite()));
+    public EditPreviewTask(@NonNull WikipediaApp app, String wikiText, 
@NonNull PageTitle title) {
+        super(app.getAPIForSite(title.getSite()));
         this.wikiText = wikiText;
         this.title = title;
     }
@@ -40,4 +40,4 @@
     public String processResult(ApiResult result) throws Throwable {
         return 
result.asObject().optJSONObject("parse").optJSONObject("text").optString("*");
     }
-}
+}
\ No newline at end of file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I801eee443aac75cda6afaee733c25784e22b5f69
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Niedzielski <sniedziel...@wikimedia.org>

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