jenkins-bot has submitted this change and it was merged.
Change subject: Ensure link preview is closed when navigating to new page.
......................................................................
Ensure link preview is closed when navigating to new page.
Currently, it's possible to navigate to a new page without the link preview
closing (see T109895 for reproduction steps). This patch fixes that, by trying
to close the link preview (if there is one) whenever the user navigates to a
new page.
Bug: T109895
Change-Id: I29c48a4136d1ae4cd2c829d94d4b07ce94d93de8
---
M app/src/main/java/org/wikipedia/page/PageActivity.java
1 file changed, 17 insertions(+), 2 deletions(-)
Approvals:
Dbrant: Looks good to me, approved
Niedzielski: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/app/src/main/java/org/wikipedia/page/PageActivity.java
b/app/src/main/java/org/wikipedia/page/PageActivity.java
index f084628..848f801 100644
--- a/app/src/main/java/org/wikipedia/page/PageActivity.java
+++ b/app/src/main/java/org/wikipedia/page/PageActivity.java
@@ -626,6 +626,10 @@
final TabPosition position,
boolean allowStateLoss,
final boolean mustBeEmpty) {
+
+ // Close the link preview, if one is open.
+ hideLinkPreview();
+
ACRA.getErrorReporter().putCustomData("api",
title.getSite().getApiDomain());
ACRA.getErrorReporter().putCustomData("title", title.toString());
@@ -701,8 +705,19 @@
public void showLinkPreview(PageTitle title, int entrySource) {
final String linkPreviewFragmentTag = "link_preview_dialog";
if
(getSupportFragmentManager().findFragmentByTag(linkPreviewFragmentTag) == null)
{
- LinkPreviewDialog dialog = LinkPreviewDialog.newInstance(title,
entrySource);
- dialog.show(getSupportFragmentManager(), linkPreviewFragmentTag);
+ LinkPreviewDialog linkPreview =
LinkPreviewDialog.newInstance(title, entrySource);
+ linkPreview.show(getSupportFragmentManager(),
linkPreviewFragmentTag);
+ }
+ }
+
+ /**
+ * Dismiss the current link preview, if one is open.
+ */
+ private void hideLinkPreview() {
+ final String linkPreviewFragmentTag = "link_preview_dialog";
+ LinkPreviewDialog linkPreview = (LinkPreviewDialog)
getSupportFragmentManager().findFragmentByTag(linkPreviewFragmentTag);
+ if (linkPreview != null) {
+ linkPreview.dismiss();
}
}
--
To view, visit https://gerrit.wikimedia.org/r/233089
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I29c48a4136d1ae4cd2c829d94d4b07ce94d93de8
Gerrit-PatchSet: 3
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Deskana <[email protected]>
Gerrit-Reviewer: BearND <[email protected]>
Gerrit-Reviewer: Brion VIBBER <[email protected]>
Gerrit-Reviewer: Dbrant <[email protected]>
Gerrit-Reviewer: Deskana <[email protected]>
Gerrit-Reviewer: Mholloway <[email protected]>
Gerrit-Reviewer: Niedzielski <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
