Skip to content

Fix Chrome Custom Tab auto-dismissal after verification on Android #14

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
seftena merged 2 commits into from
Apr 23, 2026
Merged

Fix Chrome Custom Tab auto-dismissal after verification on Android #14

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
4efb6bc
Update IDmeAuthManager.kt
seftena Apr 23, 2026
8d85a4a
Update IDmeRedirectActivity.kt
seftena Apr 23, 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
5 changes: 5 additions & 0 deletions sdk/src/main/kotlin/com/idme/auth/auth/IDmeAuthManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import android.net.Uri
import androidx.browser.customtabs.CustomTabsIntent
import com.idme.auth.errors.IDmeAuthError
import java.util.concurrent.ConcurrentHashMap
import java.lang.ref.WeakReference
import kotlinx.coroutines.CompletableDeferred

/**
Expand All @@ -21,6 +22,8 @@ import kotlinx.coroutines.CompletableDeferred
internal object IDmeAuthManager {
private val pending = ConcurrentHashMap<String, CompletableDeferred<String>>()

internal var callingActivity: WeakReference<Activity>? = null

/**
* Launches the authentication flow in a Chrome Custom Tab and suspends
* until the redirect is received.
Expand All @@ -33,6 +36,7 @@ internal object IDmeAuthManager {
suspend fun launchAuth(activity: Activity, authUrl: String, sessionId: String): String {
val deferred = CompletableDeferred<String>()
pending[sessionId] = deferred
callingActivity = WeakReference(activity)

val customTabsIntent = CustomTabsIntent.Builder()
.setShowTitle(true)
Expand All @@ -45,6 +49,7 @@ internal object IDmeAuthManager {
} catch (e: kotlinx.coroutines.CancellationException) {
throw IDmeAuthError.UserCancelled
} finally {
callingActivity = null
pending.remove(sessionId)
}
}
Expand Down
8 changes: 8 additions & 0 deletions sdk/src/main/kotlin/com/idme/auth/auth/IDmeRedirectActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.idme.auth.auth

import android.app.Activity
import android.content.Intent
import android.os.Bundle

/**
Expand Down Expand Up @@ -47,6 +48,13 @@ class IDmeRedirectActivity : Activity() {
} else {
IDmeAuthManager.handleCancel()
}
IDmeAuthManager.callingActivity?.get()?.let { activity ->
val intent = Intent(this, activity::class.java).apply {
flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP
}
startActivity(intent)
}

finish()
}
}
Loading