Skip to content

Fix: notification links with ampersands in page titles work correctly #6348

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hpr wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix: notification links with ampersands in page titles work correctly #6348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
423bb28
Fix: notification links with ampersands in page titles work correctly
hpr Feb 26, 2026
7cc6cc7
store encoded URL separately for URL parsing
hpr Feb 27, 2026
dac4fa7
Merge branch 'main' into fix-notification-link-ampersand
cooltey Apr 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/src/main/java/org/wikipedia/notifications/NotificationActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,7 +484,7 @@ class NotificationActivity : BaseActivity() {
val n = container.notification!!
markReadItems(listOf(container), markUnread = false, fromUndoOrClick = true, position = itemPosition)
n.contents?.links?.getPrimary()?.let { link ->
val url = link.url
val url = link.encodedUrl
if (url.isNotEmpty()) {
linkHandler.wikiSite = WikiSite(url)
linkHandler.onUrlClick(url, null, "")
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/wikipedia/notifications/NotificationPresenter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ object NotificationPresenter {
}

private fun addActionForDiffLink(context: Context, builder: NotificationCompat.Builder, link: Notification.Link, n: Notification) {
val uri = Uri.parse(link.url)
val uri = Uri.parse(link.encodedUrl)
val title = uri.getQueryParameter("title")
val oldRev = uri.getQueryParameter("prev").orEmpty().toLongOrNull() ?: -1
val newRev = uri.getQueryParameter("diff").orEmpty().toLongOrNull() ?: -1
Expand Down
6 changes: 6 additions & 0 deletions app/src/main/java/org/wikipedia/notifications/db/Notification.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,12 +84,18 @@ class Notification(var id: Long = 0,
private val description: String = ""
var url: String = ""
private set
var encodedUrl: String = ""
private set
val label: String = ""
val tooltip: String = ""
// The icon could be a string or `false`.
private val icon: JsonElement? = null

init {
encodedUrl = url
if (encodedUrl.startsWith("//")) {
encodedUrl = WikiSite.DEFAULT_SCHEME + "://" + encodedUrl.substring(2)
}
url = UriUtil.decodeURL(url)
if (url.startsWith("//")) {
url = url.replaceFirst("//", WikiSite.DEFAULT_SCHEME + "://")
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/wikipedia/views/NotificationActionsOverflowView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ class NotificationActionsOverflowView(context: Context) : FrameLayout(context) {

private var actionClickListener = OnClickListener {
val link = it.tag as Notification.Link
val url = link.url
val url = link.encodedUrl
val notification = container.notification
if (url.isNotEmpty() && notification != null) {
linkHandler.wikiSite = WikiSite(url)
Expand Down