Skip to content

3Dセキュアの認証をWebで実施した後にアプリに戻れない問題を修正 #61

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
merged 2 commits into from
Aug 8, 2024
Merged

3Dセキュアの認証をWebで実施した後にアプリに戻れない問題を修正 #61

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
7d193e2
Fix TDS browser
yatatsu Aug 7, 2024
ae5318e
Fix chrome
yatatsu Aug 7, 2024
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
5 changes: 5 additions & 0 deletions payjp-android-verifier/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@
-->

<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<queries>
<intent>
<action android:name="android.support.customtabs.action.CustomTabsService" />
</intent>
</queries>

<application>

Expand Down
2 changes: 1 addition & 1 deletion payjp-android-verifier/src/main/kotlin/jp/pay/android/verifier/ui/PayjpWebActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ class PayjpWebActivity : AppCompatActivity(), LifecycleObserver {
swipeRefresh = binding.swipeRefresh
)
)
addOnFinishedLoadState { _, url ->
addOnStartedLoadState { _, url ->
if (url.startsWith(callbackUri.toString())) {
logger.d("url matches with callbackUri $url")
redirectWithResult(Uri.parse(url))
Expand Down
4 changes: 2 additions & 2 deletions payjp-android-verifier/src/main/kotlin/jp/pay/android/verifier/ui/VerifierWebView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,8 @@ internal class VerifierWebView @JvmOverloads constructor(
loadStateWatchers.add(loadStateWatcher)
}

fun addOnFinishedLoadState(onFinished: (webView: WebView, url: String) -> Unit) {
addLoadStateWatcher(onFinished = onFinished)
fun addOnStartedLoadState(onStarted: (webView: WebView, url: String) -> Unit) {
addLoadStateWatcher(onStarted = onStarted)
}

fun addLoadStateWatcher(
Expand Down