Skip to content

Fix Sentry JETPACK-ANDROID-1G9S and 1J82: avoid openUrl with empty url #23147

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

Closed
nbradbury wants to merge 1 commit into from
+12 −3
Closed

Fix Sentry JETPACK-ANDROID-1G9S and 1J82: avoid openUrl with empty url #23147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 11 additions & 2 deletions WordPress/src/main/java/org/wordpress/android/ui/WPWebViewActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,8 +348,17 @@ private void initViewModel(WPWebViewUsageCategory webViewUsageCategory) {
});

mViewModel.getOpenExternalBrowser().observe(this, unit -> {
ReaderActivityLauncher.openUrl(WPWebViewActivity.this, mWebView.getUrl(),
ReaderActivityLauncher.OpenUrlType.EXTERNAL);
// Prefer the currently loaded URL, but fall back to the requested URL when the page
// hasn't finished loading yet (mWebView.getUrl() is null before the first load).
String urlToOpen = mWebView.getUrl();
if (TextUtils.isEmpty(urlToOpen)) {
Bundle extras = getIntent().getExtras();
urlToOpen = extras != null ? extras.getString(URL_TO_LOAD) : null;
}
if (!TextUtils.isEmpty(urlToOpen)) {
ReaderActivityLauncher.openUrl(WPWebViewActivity.this, urlToOpen,
ReaderActivityLauncher.OpenUrlType.EXTERNAL);
}
});

mViewModel.getPreviewModeSelector().observe(this, previewModelSelectorStatus -> {
Expand Down
2 changes: 1 addition & 1 deletion WordPress/src/main/java/org/wordpress/android/ui/comments/CommentDetailFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -831,7 +831,7 @@ private void showCommentWhenNonNull(
updateStatusViews(binding, actionBinding, site, comment, note);

// navigate to author's blog when avatar or name clicked
if (comment.getAuthorUrl() != null) {
if (!TextUtils.isEmpty(comment.getAuthorUrl())) {
View.OnClickListener authorListener =
v -> ReaderActivityLauncher.openUrl(getActivity(), comment.getAuthorUrl());
binding.imageAvatar.setOnClickListener(authorListener);
Expand Down
Loading