Brion VIBBER has submitted this change and it was merged.
Change subject: Don't pass title to RefreshCaptcha when Site would do
......................................................................
Don't pass title to RefreshCaptcha when Site would do
Change-Id: Idad201d6e7d6e511f4aa803ab9f2f368308c0a7e
---
M wikipedia/src/main/java/org/wikipedia/editing/CaptchaHandler.java
M wikipedia/src/main/java/org/wikipedia/editing/EditSectionActivity.java
M wikipedia/src/main/java/org/wikipedia/editing/RefreshCaptchaTask.java
3 files changed, 8 insertions(+), 8 deletions(-)
Approvals:
Brion VIBBER: Verified; Looks good to me, approved
diff --git a/wikipedia/src/main/java/org/wikipedia/editing/CaptchaHandler.java
b/wikipedia/src/main/java/org/wikipedia/editing/CaptchaHandler.java
index 17adf54..509f6b7 100644
--- a/wikipedia/src/main/java/org/wikipedia/editing/CaptchaHandler.java
+++ b/wikipedia/src/main/java/org/wikipedia/editing/CaptchaHandler.java
@@ -16,7 +16,7 @@
private View captchaProgress;
private ImageView captchaImage;
private EditText captchaText;
- private PageTitle title;
+ private Site site;
private ProgressDialog progressDialog;
private View primaryView;
@@ -24,9 +24,9 @@
private CaptchaResult captchaResult;
- public CaptchaHandler(final Activity activity, final PageTitle title,
final ProgressDialog progressDialog, final View primaryView, final int
prevTitleId) {
+ public CaptchaHandler(final Activity activity, final Site site, final
ProgressDialog progressDialog, final View primaryView, final int prevTitleId) {
this.activity = activity;
- this.title = title;
+ this.site = site;
this.progressDialog = progressDialog;
this.primaryView = primaryView;
this.prevTitleId = prevTitleId;
@@ -39,7 +39,7 @@
captchaImage.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- new RefreshCaptchaTask(activity, title) {
+ new RefreshCaptchaTask(activity, site) {
@Override
public void onBeforeExecute() {
Utils.crossFade(captchaImage, captchaProgress);
@@ -76,7 +76,7 @@
return;
}
Picasso.with(activity)
- .load(Uri.parse(captchaResult.getCaptchaUrl(title.getSite())))
+ .load(Uri.parse(captchaResult.getCaptchaUrl(site)))
// Don't use .fit() here - seems to cause the loading
to fail
// See https://github.com/square/picasso/issues/249
.into(captchaImage, new Callback() {
diff --git
a/wikipedia/src/main/java/org/wikipedia/editing/EditSectionActivity.java
b/wikipedia/src/main/java/org/wikipedia/editing/EditSectionActivity.java
index 271cdd1..eec715a 100644
--- a/wikipedia/src/main/java/org/wikipedia/editing/EditSectionActivity.java
+++ b/wikipedia/src/main/java/org/wikipedia/editing/EditSectionActivity.java
@@ -73,7 +73,7 @@
abusefilterBridge = new CommunicationBridge(abusefilterWebView,
"file:///android_asset/abusefilter.html");
abuseFilterBackAction =
findViewById(R.id.edit_section_abusefilter_back);
- captchaHandler = new CaptchaHandler(this, title, progressDialog,
sectionContainer, R.string.edit_section_activity_title);
+ captchaHandler = new CaptchaHandler(this, title.getSite(),
progressDialog, sectionContainer, R.string.edit_section_activity_title);
if (savedInstanceState != null &&
savedInstanceState.containsKey("sectionWikitext")) {
sectionWikitext = savedInstanceState.getString("sectionWikitext");
diff --git
a/wikipedia/src/main/java/org/wikipedia/editing/RefreshCaptchaTask.java
b/wikipedia/src/main/java/org/wikipedia/editing/RefreshCaptchaTask.java
index 4349d88..8cc9b85 100644
--- a/wikipedia/src/main/java/org/wikipedia/editing/RefreshCaptchaTask.java
+++ b/wikipedia/src/main/java/org/wikipedia/editing/RefreshCaptchaTask.java
@@ -7,10 +7,10 @@
import org.wikipedia.concurrency.*;
public class RefreshCaptchaTask extends ApiTask<CaptchaResult> {
- public RefreshCaptchaTask(Context context, PageTitle title) {
+ public RefreshCaptchaTask(Context context, Site site) {
super(
ExecutorService.getSingleton().getExecutor(DoEditTask.class,
1),
-
((WikipediaApp)context.getApplicationContext()).getAPIForSite(title.getSite())
+
((WikipediaApp)context.getApplicationContext()).getAPIForSite(site)
);
}
--
To view, visit https://gerrit.wikimedia.org/r/114445
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idad201d6e7d6e511f4aa803ab9f2f368308c0a7e
Gerrit-PatchSet: 2
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda <yuvipa...@gmail.com>
Gerrit-Reviewer: Brion VIBBER <br...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
