Skip to content

Update getCurrentActivity in GoogleAuthModule.kt #15

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
sbaiahmed1 merged 1 commit into from
Jan 12, 2026
Merged

Update getCurrentActivity in GoogleAuthModule.kt #15

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
8 changes: 4 additions & 4 deletions android/src/main/java/com/googleauth/GoogleAuthModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ class GoogleAuthModule(reactContext: ReactApplicationContext) :
}

// No cached tokens, try silent sign-in
val activity = currentActivity
val activity = reactApplicationContext.currentActivity
if (activity == null) {
promise.reject("NO_ACTIVITY", "No current activity available")
return
Expand Down Expand Up @@ -347,7 +347,7 @@ class GoogleAuthModule(reactContext: ReactApplicationContext) :
return
}

val activity = currentActivity
val activity = reactApplicationContext.currentActivity
if (activity == null) {
promise.reject("NO_ACTIVITY", "No current activity available")
return
Expand Down Expand Up @@ -438,7 +438,7 @@ class GoogleAuthModule(reactContext: ReactApplicationContext) :
}

if (!isAvailable && showErrorDialog == true) {
currentActivity?.let { activity ->
reactApplicationContext.currentActivity?.let { activity ->
if (googleApiAvailability.isUserResolvableError(resultCode)) {
googleApiAvailability.getErrorDialog(activity, resultCode, 9000)?.show()
}
Expand All @@ -454,7 +454,7 @@ class GoogleAuthModule(reactContext: ReactApplicationContext) :
// MARK: - Helper Methods

private fun getValidActivity(): Activity? {
val activity = currentActivity
val activity = reactApplicationContext.currentActivity
return if (activity != null && !activity.isFinishing && !activity.isDestroyed) {
activity
} else {
Expand Down
Loading