[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Fix navigation to certain links from Reference popups.

2017-11-27 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/393618 )

Change subject: Fix navigation to certain links from Reference popups.
..


Fix navigation to certain links from Reference popups.

Bug: T180823
Change-Id: I2e05da1099e4495ff4966bd8f4dd6c791f44aec3
---
M app/src/main/java/org/wikipedia/page/LinkHandler.java
1 file changed, 3 insertions(+), 2 deletions(-)

Approvals:
  jenkins-bot: Verified
  Cooltey: Looks good to me, approved



diff --git a/app/src/main/java/org/wikipedia/page/LinkHandler.java 
b/app/src/main/java/org/wikipedia/page/LinkHandler.java
index 68b5943..344edd3 100644
--- a/app/src/main/java/org/wikipedia/page/LinkHandler.java
+++ b/app/src/main/java/org/wikipedia/page/LinkHandler.java
@@ -87,13 +87,14 @@
 }
 PageTitle title = TextUtils.isEmpty(titleString)
 ? site.titleForInternalLink(uri.getPath())
-: new PageTitle(titleString, site);
+: PageTitle.withSeparateFragment(titleString, 
uri.getFragment(), site);
 onInternalLinkClicked(title);
 } else if (!TextUtils.isEmpty(titleString) && 
UriUtil.isValidOfflinePageLink(uri)) {
 WikiSite site = new WikiSite(uri);
 PageTitle title = PageTitle.withSeparateFragment(titleString, 
uri.getFragment(), site);
 onInternalLinkClicked(title);
-} else if (!TextUtils.isEmpty(uri.getFragment())) {
+} else if (!TextUtils.isEmpty(uri.getAuthority()) && 
WikiSite.supportedAuthority(uri.getAuthority())
+&& !TextUtils.isEmpty(uri.getFragment())) {
 onPageLinkClicked(uri.getFragment());
 } else {
 onExternalLinkClicked(uri);

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2e05da1099e4495ff4966bd8f4dd6c791f44aec3
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant 
Gerrit-Reviewer: Brion VIBBER 
Gerrit-Reviewer: Cooltey 
Gerrit-Reviewer: Sharvaniharan 
Gerrit-Reviewer: jenkins-bot <>

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


[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Fix navigation to certain links from Reference popups.

2017-11-27 Thread Dbrant (Code Review)
Dbrant has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/393618 )

Change subject: Fix navigation to certain links from Reference popups.
..

Fix navigation to certain links from Reference popups.

Bug: T180823
Change-Id: I2e05da1099e4495ff4966bd8f4dd6c791f44aec3
---
M app/src/main/java/org/wikipedia/page/LinkHandler.java
1 file changed, 3 insertions(+), 2 deletions(-)


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

diff --git a/app/src/main/java/org/wikipedia/page/LinkHandler.java 
b/app/src/main/java/org/wikipedia/page/LinkHandler.java
index 68b5943..344edd3 100644
--- a/app/src/main/java/org/wikipedia/page/LinkHandler.java
+++ b/app/src/main/java/org/wikipedia/page/LinkHandler.java
@@ -87,13 +87,14 @@
 }
 PageTitle title = TextUtils.isEmpty(titleString)
 ? site.titleForInternalLink(uri.getPath())
-: new PageTitle(titleString, site);
+: PageTitle.withSeparateFragment(titleString, 
uri.getFragment(), site);
 onInternalLinkClicked(title);
 } else if (!TextUtils.isEmpty(titleString) && 
UriUtil.isValidOfflinePageLink(uri)) {
 WikiSite site = new WikiSite(uri);
 PageTitle title = PageTitle.withSeparateFragment(titleString, 
uri.getFragment(), site);
 onInternalLinkClicked(title);
-} else if (!TextUtils.isEmpty(uri.getFragment())) {
+} else if (!TextUtils.isEmpty(uri.getAuthority()) && 
WikiSite.supportedAuthority(uri.getAuthority())
+&& !TextUtils.isEmpty(uri.getFragment())) {
 onPageLinkClicked(uri.getFragment());
 } else {
 onExternalLinkClicked(uri);

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2e05da1099e4495ff4966bd8f4dd6c791f44aec3
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant 

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