Skip to content

fix: SC-199871 Prevent redirect to app error page for external domain errors #27

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
qsdnikola merged 2 commits into from
Oct 3, 2025
+12 −2
Merged

fix: SC-199871 Prevent redirect to app error page for external domain errors #27

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
348af24
do not redirect to the App error page when the error comes from anoth…
ccw-morris Sep 10, 2025
4210703
copilot recommendations
ccw-morris Sep 10, 2025
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
14 changes: 12 additions & 2 deletions messenger/src/main/java/com/deskpro/messenger/ui/MessengerWebViewActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ import com.deskpro.messenger.util.extensions.EvaluateScriptsUtil.initAndOpenScri
import com.deskpro.messenger.util.extensions.extractAppId
import com.deskpro.messenger.util.extensions.extractUrl
import timber.log.Timber
import java.net.MalformedURLException
import java.net.URL

/**
* Activity hosting the WebView for DeskPro Messenger functionality.
Expand Down Expand Up @@ -115,8 +117,16 @@ internal class MessengerWebViewActivity : AppCompatActivity() {
error: WebResourceError?
) {
super.onReceivedError(view, request, error)
binding.progressBar.visibility = View.GONE
loadErrorHtmlPage()
// Only redirect to error page if the error came from the Messenger domain
try {
if (URL(url).host == request?.url?.host) {
Comment thread
ccw-morris marked this conversation as resolved.
Comment thread
ccw-morris marked this conversation as resolved.
binding.progressBar.visibility = View.GONE
loadErrorHtmlPage()
}
} catch (e: MalformedURLException) {
// If url is malformed then Messenger has failed to load
Comment thread
ccw-morris marked this conversation as resolved.
loadErrorHtmlPage()
}
Comment thread
ccw-morris marked this conversation as resolved.
}
}
}
Expand Down