Skip to content
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

Remove PaymentAuthWebViewClient.onPageCommitVisible() override #1686

Merged
merged 1 commit into from
Oct 9, 2019
Merged

Remove PaymentAuthWebViewClient.onPageCommitVisible() override #1686

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
20 changes: 4 additions & 16 deletions stripe/src/main/java/com/stripe/android/view/PaymentAuthWebView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,24 +81,13 @@ internal class PaymentAuthWebView @JvmOverloads constructor(
var completionUrlParam: String? = null
private set

// true if another app was opened from this WebView
var hasOpenedApp: Boolean = false
private set

override fun onPageCommitVisible(view: WebView, url: String) {
logger.debug("PaymentAuthWebViewClient#onPageCommitVisible() - $url")
super.onPageCommitVisible(view, url)
hideProgressBar()
}

override fun onPageFinished(view: WebView, url: String?) {
logger.debug("PaymentAuthWebViewClient#onPageFinished() - $url")
super.onPageFinished(view, url)
if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.LOLLIPOP_MR1) {
// hide the progress bar here because `onPageCommitVisible()`
// is not called in API 22 and below
hideProgressBar()
}
// hide the progress bar here because doing it in `onPageCommitVisible()` potentially
// causes a crash
hideProgressBar()

if (url != null && isCompletionUrl(url)) {
onAuthCompleted()
}
Expand Down Expand Up @@ -157,7 +146,6 @@ internal class PaymentAuthWebView @JvmOverloads constructor(
private fun openIntent(intent: Intent) {
logger.debug("PaymentAuthWebViewClient#openIntent()")
if (intent.resolveActivity(packageManager) != null) {
hasOpenedApp = true
activity.startActivity(intent)
} else {
// complete auth if the deep-link can't be opened
Expand Down