Skip to content

Open rs post and page "View" in a Custom Tab #23366

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

Merged
nbradbury merged 2 commits into from
Sep 25, 2026
+11 −2
Merged

Open rs post and page "View" in a Custom Tab #23366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
39ac5e9
Open rs post and page "View" in a Custom Tab
nbradbury Sep 25, 2026
6c1266f
Target the browser when opening a Custom Tab
nbradbury Sep 25, 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
3 changes: 3 additions & 0 deletions WordPress/src/main/java/org/wordpress/android/ui/ActivityNavigator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import android.app.Activity
import android.content.ActivityNotFoundException
import android.content.Context
import android.content.Intent
import androidx.browser.customtabs.CustomTabsClient
import androidx.browser.customtabs.CustomTabsIntent
import androidx.core.app.TaskStackBuilder
import androidx.core.net.toUri
Expand Down Expand Up @@ -276,6 +277,8 @@ class ActivityNavigator @Inject constructor(
@Suppress("TooGenericExceptionCaught")
fun openInCustomTab(activity: Activity, url: String) {
val intent = getCustomTabsIntent(activity)
// Target the browser directly, otherwise our own deep-link aliases can claim WP.com post URLs
CustomTabsClient.getPackageName(activity, null)?.let { intent.intent.setPackage(it) }
try {
intent.launchUrl(activity, url.toUri())
} catch (e: RuntimeException) {
Expand Down
4 changes: 3 additions & 1 deletion WordPress/src/main/java/org/wordpress/android/ui/pagesrs/PagesRsListActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import kotlinx.coroutines.launch
import org.wordpress.android.R
import org.wordpress.android.fluxc.model.SiteModel
import org.wordpress.android.ui.ActivityLauncher
import org.wordpress.android.ui.ActivityNavigator
import org.wordpress.android.ui.stats.StatsConstants
import org.wordpress.android.ui.stats.refresh.lists.detail.StatsDetailActivity
import org.wordpress.android.ui.PagePostCreationSourcesDetail.PAGE_FROM_PAGES_LIST
Expand All @@ -43,6 +44,7 @@ class PagesRsListActivity : BaseAppCompatActivity() {
@Inject lateinit var viewModelFactory: ViewModelProvider.Factory
@Inject lateinit var buildConfigWrapper: BuildConfigWrapper
@Inject lateinit var experimentalFeatures: ExperimentalFeatures
@Inject lateinit var activityNavigator: ActivityNavigator

private val viewModel: PagesRsListViewModel by viewModels()
private lateinit var mlpViewModel: ModalLayoutPickerViewModel
Expand Down Expand Up @@ -132,7 +134,7 @@ class PagesRsListActivity : BaseAppCompatActivity() {
is PageRsListEvent.EditPage ->
ActivityLauncher.editPostOrPageForResult(this, event.site, event.page)
is PageRsListEvent.CreateNewPage -> startCreatePageFlow()
is PageRsListEvent.ViewPage -> ActivityLauncher.openUrlExternal(this, event.url)
is PageRsListEvent.ViewPage -> activityNavigator.openInCustomTab(this, event.url)
is PageRsListEvent.SharePage ->
ActivityLauncher.openShareIntent(this, event.url, event.title)
is PageRsListEvent.CopyPageUrl -> copyUrlToClipboard(event.url)
Expand Down
6 changes: 5 additions & 1 deletion WordPress/src/main/java/org/wordpress/android/ui/postsrs/PostRsListActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import androidx.lifecycle.repeatOnLifecycle
import dagger.hilt.android.AndroidEntryPoint
import kotlinx.coroutines.launch
import org.wordpress.android.ui.ActivityLauncher
import org.wordpress.android.ui.ActivityNavigator
import org.wordpress.android.ui.PagePostCreationSourcesDetail
import org.wordpress.android.ui.blaze.BlazeFlowSource
import org.wordpress.android.ui.compose.theme.AppThemeM3
Expand All @@ -33,6 +34,9 @@ class PostRsListActivity : BaseAppCompatActivity() {
@Inject
lateinit var experimentalFeatures: ExperimentalFeatures

@Inject
lateinit var activityNavigator: ActivityNavigator

private val viewModel: PostRsListViewModel by viewModels()

private val settingsLauncher = registerForActivityResult(
Expand Down Expand Up @@ -126,7 +130,7 @@ class PostRsListActivity : BaseAppCompatActivity() {
this, event.site, false,
PagePostCreationSourcesDetail.POST_FROM_POSTS_LIST, -1, null
)
is PostRsListEvent.ViewPost -> ActivityLauncher.openUrlExternal(this, event.url)
is PostRsListEvent.ViewPost -> activityNavigator.openInCustomTab(this, event.url)
is PostRsListEvent.ReadPost ->
ReaderActivityLauncher.showReaderPostDetail(this, event.blogId, event.postId)
is PostRsListEvent.SharePost ->
Expand Down
Loading