Skip to content

Commit 7670830

Browse files
jonsimantova-maurice
authored andcommitted
Fixed a bug when deleting PhoneAuthProvider on Android as part of Auth
destruction: Env(auth_data) is no longer valid during the Auth destructor, so use GetJniEnv() to get the JNI environment instead. PiperOrigin-RevId: 270347555
1 parent 4494127 commit 7670830

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

auth/src/android/credential_android.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
#include <algorithm>
2020
#include <cstring>
2121

22-
#include "app/src/assert.h"
2322
#include "app/src/app_common.h"
23+
#include "app/src/assert.h"
2424
#include "app/src/build_type_generated.h"
2525
#include "app/src/embedded_file.h"
2626
#include "app/src/include/firebase/app.h"
@@ -659,7 +659,7 @@ struct PhoneAuthProviderData {
659659
PhoneAuthProvider::PhoneAuthProvider() : data_(nullptr) {}
660660
PhoneAuthProvider::~PhoneAuthProvider() {
661661
if (data_ != nullptr) {
662-
JNIEnv* env = Env(data_->auth_data);
662+
JNIEnv* env = GetJniEnv();
663663
env->DeleteGlobalRef(data_->j_phone_auth_provider);
664664
delete data_;
665665
}
@@ -834,9 +834,9 @@ JNIEXPORT void JNICALL JniAuthPhoneListener::nativeOnCodeAutoRetrievalTimeOut(
834834
}
835835

836836
// FederatedAuthHandlers
837-
FederatedOAuthProvider::FederatedOAuthProvider() { }
837+
FederatedOAuthProvider::FederatedOAuthProvider() {}
838838

839-
FederatedOAuthProvider::~FederatedOAuthProvider() { }
839+
FederatedOAuthProvider::~FederatedOAuthProvider() {}
840840

841841
void FederatedOAuthProvider::SetProviderData(
842842
const FederatedOAuthProviderData& provider_data) {

0 commit comments

Comments
 (0)