jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/333302 )
Change subject: Fix showing of captcha in certain API levels.
......................................................................
Fix showing of captcha in certain API levels.
Fresco loads an image into a view only when the view is VISIBLE, whereas
we were showing the captcha view slightly after loading the image into it.
Bug: T155535
Change-Id: Ia892bece3bc39afe43726d608655d8921ddd15a6
---
M app/src/main/java/org/wikipedia/captcha/CaptchaHandler.java
1 file changed, 4 insertions(+), 4 deletions(-)
Approvals:
Zppix: Looks good to me, but someone else must approve
jenkins-bot: Verified
Mholloway: Looks good to me, approved
diff --git a/app/src/main/java/org/wikipedia/captcha/CaptchaHandler.java
b/app/src/main/java/org/wikipedia/captcha/CaptchaHandler.java
index 7e675cf..94deb4b 100644
--- a/app/src/main/java/org/wikipedia/captcha/CaptchaHandler.java
+++ b/app/src/main/java/org/wikipedia/captcha/CaptchaHandler.java
@@ -128,9 +128,12 @@
handleCaptcha(false);
}
- private void handleCaptcha(final boolean isReload) {
+ private void handleCaptcha(boolean isReload) {
if (captchaResult == null) {
return;
+ }
+ if (!isReload) {
+ ViewAnimations.crossFade(primaryView, captchaContainer);
}
captchaImage.setController(Fresco.newDraweeControllerBuilder()
.setUri(captchaResult.getCaptchaUrl(wiki))
@@ -159,9 +162,6 @@
// In case there was a captcha attempt before
captchaText.setText("");
- if (!isReload) {
- ViewAnimations.crossFade(primaryView,
captchaContainer);
- }
}
})
.build());
--
To view, visit https://gerrit.wikimedia.org/r/333302
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia892bece3bc39afe43726d608655d8921ddd15a6
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant <dbr...@wikimedia.org>
Gerrit-Reviewer: Brion VIBBER <br...@wikimedia.org>
Gerrit-Reviewer: Mholloway <mhollo...@wikimedia.org>
Gerrit-Reviewer: Niedzielski <sniedziel...@wikimedia.org>
Gerrit-Reviewer: Zppix <megadev44s.m...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
