Deskana has uploaded a new change for review. https://gerrit.wikimedia.org/r/233431
Change subject: Use LinkPreviewDialog tag directly from LinkPreviewDialog class. ...................................................................... Use LinkPreviewDialog tag directly from LinkPreviewDialog class. The LinkPreviewDialog fragment was being found by its tag in several places in PageActivity. That tag was declared in two separate places, once in PageActivity and once in LinkPreviewDialog. This patch makes the tag in LinkPreviewDialog public, and uses it directly in PageActivity, to avoid duplication. Change-Id: I0d08ab2d1beffc650a9a49a92d346b9bf3c6ea91 --- M app/src/main/java/org/wikipedia/page/PageActivity.java M app/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewDialog.java 2 files changed, 4 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia refs/changes/31/233431/1 diff --git a/app/src/main/java/org/wikipedia/page/PageActivity.java b/app/src/main/java/org/wikipedia/page/PageActivity.java index 848f801..b5554ae 100644 --- a/app/src/main/java/org/wikipedia/page/PageActivity.java +++ b/app/src/main/java/org/wikipedia/page/PageActivity.java @@ -703,10 +703,9 @@ } public void showLinkPreview(PageTitle title, int entrySource) { - final String linkPreviewFragmentTag = "link_preview_dialog"; - if (getSupportFragmentManager().findFragmentByTag(linkPreviewFragmentTag) == null) { + if (getSupportFragmentManager().findFragmentByTag(LinkPreviewDialog.TAG) == null) { LinkPreviewDialog linkPreview = LinkPreviewDialog.newInstance(title, entrySource); - linkPreview.show(getSupportFragmentManager(), linkPreviewFragmentTag); + linkPreview.show(getSupportFragmentManager(), LinkPreviewDialog.TAG); } } @@ -714,8 +713,7 @@ * Dismiss the current link preview, if one is open. */ private void hideLinkPreview() { - final String linkPreviewFragmentTag = "link_preview_dialog"; - LinkPreviewDialog linkPreview = (LinkPreviewDialog) getSupportFragmentManager().findFragmentByTag(linkPreviewFragmentTag); + LinkPreviewDialog linkPreview = (LinkPreviewDialog) getSupportFragmentManager().findFragmentByTag(LinkPreviewDialog.TAG); if (linkPreview != null) { linkPreview.dismiss(); } diff --git a/app/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewDialog.java b/app/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewDialog.java index 9fab470..8507be2 100755 --- a/app/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewDialog.java +++ b/app/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewDialog.java @@ -33,7 +33,7 @@ import java.util.Map; public class LinkPreviewDialog extends SwipeableBottomDialog implements DialogInterface.OnDismissListener { - private static final String TAG = "LinkPreviewDialog"; + public static final String TAG = "LinkPreviewDialog"; private boolean navigateSuccess = false; -- To view, visit https://gerrit.wikimedia.org/r/233431 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0d08ab2d1beffc650a9a49a92d346b9bf3c6ea91 Gerrit-PatchSet: 1 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: Deskana <dga...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits