Skip to content

Commit 335222d

Browse files
committed
fix(auth): sendEmailVerification crash
1 parent f2c3ded commit 335222d

2 files changed

Lines changed: 18 additions & 13 deletions

File tree

66 Bytes
Binary file not shown.

packages/firebase-auth/src-native/android/firebaseauth/src/main/java/org/nativescript/firebaseauth/FirebaseAuth.kt

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package org.nativescript.firebaseauth
33
import android.app.Activity
44
import android.os.Handler
55
import android.os.Looper
6-
import androidx.annotation.Nullable
6+
import com.google.android.gms.tasks.Task
77
import com.google.firebase.auth.*
88
import java.util.concurrent.Executors
99

@@ -163,21 +163,26 @@ class FirebaseAuth {
163163
@JvmStatic
164164
fun sendEmailVerification(
165165
user: FirebaseUser,
166-
@Nullable actionCodeSettings: ActionCodeSettings,
166+
actionCodeSettings: ActionCodeSettings?,
167167
callback: Callback<Void>
168168
) {
169-
user.sendEmailVerification(actionCodeSettings)
170-
.addOnCompleteListener(executors) {
171-
if (it.isSuccessful) {
172-
runOnMain {
173-
callback.onSuccess(it.result)
174-
}
175-
} else {
176-
runOnMain {
177-
callback.onError(it.exception)
178-
}
169+
val call = if (actionCodeSettings == null) {
170+
user.sendEmailVerification()
171+
} else {
172+
user.sendEmailVerification(actionCodeSettings)
173+
}
174+
175+
call.addOnCompleteListener(executors) {
176+
if (it.isSuccessful) {
177+
runOnMain {
178+
callback.onSuccess(it.result)
179+
}
180+
} else {
181+
runOnMain {
182+
callback.onError(it.exception)
179183
}
180184
}
185+
}
181186
}
182187

183188

@@ -288,7 +293,7 @@ class FirebaseAuth {
288293
fun verifyBeforeUpdateEmail(
289294
user: FirebaseUser,
290295
email: String,
291-
@Nullable actionCodeSettings: ActionCodeSettings,
296+
actionCodeSettings: ActionCodeSettings?,
292297
callback: Callback<Void>
293298
) {
294299
user.verifyBeforeUpdateEmail(email, actionCodeSettings)

0 commit comments

Comments
 (0)