Skip to content
This repository was archived by the owner on Feb 22, 2023. It is now read-only.

[firebase_auth] Resolve deprecated API warnings #814

Closed
wants to merge 1 commit into from
Closed

[firebase_auth] Resolve deprecated API warnings #814

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
114 changes: 54 additions & 60 deletions ...rebase_auth/android/src/main/java/io/flutter/plugins/firebaseauth/FirebaseAuthPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ private FirebaseAuthPlugin(PluginRegistry.Registrar registrar, MethodChannel cha
}

private FirebaseAuth getAuth(MethodCall call) {
Map<String, Object> arguments = (Map<String, Object>) call.arguments;
Map<String, Object> arguments = call.arguments();
String appName = (String) arguments.get("app");
FirebaseApp app = FirebaseApp.getInstance(appName);
return FirebaseAuth.getInstance(app);
Expand Down Expand Up @@ -151,8 +151,7 @@ public void onMethodCall(MethodCall call, Result result) {

private void handleSignInWithPhoneNumber(
MethodCall call, Result result, FirebaseAuth firebaseAuth) {
@SuppressWarnings("unchecked")
Map<String, String> arguments = (Map<String, String>) call.arguments;
Map<String, String> arguments = call.arguments();
String verificationId = arguments.get("verificationId");
String smsCode = arguments.get("smsCode");

Expand All @@ -165,7 +164,6 @@ private void handleSignInWithPhoneNumber(

private void handleVerifyPhoneNumber(
MethodCall call, Result result, final FirebaseAuth firebaseAuth) {
@SuppressWarnings("unchecked")
final int handle = call.argument("handle");
String phoneNumber = call.argument("phoneNumber");
int timeout = call.argument("timeout");
Expand Down Expand Up @@ -237,6 +235,7 @@ public void onCodeAutoRetrievalTimeOut(String verificationId) {
registrar.activity(),
verificationCallbacks);
}
result.success(null);
}

private Map<String, Object> getVerifyPhoneNumberExceptionMap(FirebaseException e) {
Expand All @@ -259,8 +258,7 @@ private Map<String, Object> getVerifyPhoneNumberExceptionMap(FirebaseException e

private void handleLinkWithEmailAndPassword(
MethodCall call, Result result, FirebaseAuth firebaseAuth) {
@SuppressWarnings("unchecked")
Map<String, String> arguments = (Map<String, String>) call.arguments;
Map<String, String> arguments = call.arguments();
String email = arguments.get("email");
String password = arguments.get("password");

Expand All @@ -271,25 +269,30 @@ private void handleLinkWithEmailAndPassword(
.addOnCompleteListener(new SignInCompleteListener(result));
}

private void handleCurrentUser(MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
FirebaseUser user = firebaseAuth.getCurrentUser();
if (user == null) {
result.success(null);
return;
}
Map<String, Object> userMap = mapFromUser(user);
result.success(userMap);
private void handleCurrentUser(
@SuppressWarnings("unused") MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
final FirebaseAuth.AuthStateListener listener =
new FirebaseAuth.AuthStateListener() {
@Override
public void onAuthStateChanged(@NonNull FirebaseAuth firebaseAuth) {
firebaseAuth.removeAuthStateListener(this);
FirebaseUser user = firebaseAuth.getCurrentUser();
Map<String, Object> userMap = mapFromUser(user);
result.success(userMap);
}
};

firebaseAuth.addAuthStateListener(listener);
}

private void handleSignInAnonymously(
MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
@SuppressWarnings("unused") MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
firebaseAuth.signInAnonymously().addOnCompleteListener(new SignInCompleteListener(result));
}

private void handleCreateUserWithEmailAndPassword(
MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
@SuppressWarnings("unchecked")
Map<String, String> arguments = (Map<String, String>) call.arguments;
Map<String, String> arguments = call.arguments();
String email = arguments.get("email");
String password = arguments.get("password");

Expand All @@ -300,19 +303,17 @@ private void handleCreateUserWithEmailAndPassword(

private void handleFetchProvidersForEmail(
MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
@SuppressWarnings("unchecked")
Map<String, String> arguments = (Map<String, String>) call.arguments;
Map<String, String> arguments = call.arguments();
String email = arguments.get("email");

firebaseAuth
.fetchProvidersForEmail(email)
.addOnCompleteListener(new ProvidersCompleteListener(result));
.fetchSignInMethodsForEmail(email)
.addOnCompleteListener(new SignInMethodCompleteListener(result));
}

private void handleSendPasswordResetEmail(
MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
@SuppressWarnings("unchecked")
Map<String, String> arguments = (Map<String, String>) call.arguments;
Map<String, String> arguments = call.arguments();
String email = arguments.get("email");

firebaseAuth
Expand All @@ -321,24 +322,32 @@ private void handleSendPasswordResetEmail(
}

private void handleSendEmailVerification(
MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
@SuppressWarnings("unused") MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
firebaseAuth
.getCurrentUser()
.sendEmailVerification()
.addOnCompleteListener(new TaskVoidCompleteListener(result));
}

private void handleReload(MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
private void handleReload(
@SuppressWarnings("unused") MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
firebaseAuth
.getCurrentUser()
.reload()
.addOnCompleteListener(new TaskVoidCompleteListener(result));
}

private void handleDelete(
@SuppressWarnings("unused") MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
firebaseAuth
.getCurrentUser()
.delete()
.addOnCompleteListener(new TaskVoidCompleteListener(result));
}

private void handleSignInWithEmailAndPassword(
MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
@SuppressWarnings("unchecked")
Map<String, String> arguments = (Map<String, String>) call.arguments;
Map<String, String> arguments = call.arguments();
String email = arguments.get("email");
String password = arguments.get("password");

Expand All @@ -347,17 +356,9 @@ private void handleSignInWithEmailAndPassword(
.addOnCompleteListener(new SignInCompleteListener(result));
}

private void handleDelete(MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
firebaseAuth
.getCurrentUser()
.delete()
.addOnCompleteListener(new TaskVoidCompleteListener(result));
}

private void handleSignInWithGoogle(
MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
@SuppressWarnings("unchecked")
Map<String, String> arguments = (Map<String, String>) call.arguments;
Map<String, String> arguments = call.arguments();
String idToken = arguments.get("idToken");
String accessToken = arguments.get("accessToken");
AuthCredential credential = GoogleAuthProvider.getCredential(idToken, accessToken);
Expand All @@ -368,8 +369,7 @@ private void handleSignInWithGoogle(

private void handleLinkWithGoogleCredential(
MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
@SuppressWarnings("unchecked")
Map<String, String> arguments = (Map<String, String>) call.arguments;
Map<String, String> arguments = call.arguments();
String idToken = arguments.get("idToken");
String accessToken = arguments.get("accessToken");
AuthCredential credential = GoogleAuthProvider.getCredential(idToken, accessToken);
Expand All @@ -381,8 +381,7 @@ private void handleLinkWithGoogleCredential(

private void handleLinkWithFacebookCredential(
MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
@SuppressWarnings("unchecked")
Map<String, String> arguments = (Map<String, String>) call.arguments;
Map<String, String> arguments = call.arguments();
String accessToken = arguments.get("accessToken");
AuthCredential credential = FacebookAuthProvider.getCredential(accessToken);
firebaseAuth
Expand All @@ -393,8 +392,7 @@ private void handleLinkWithFacebookCredential(

private void handleLinkWithTwitterCredential(
MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
@SuppressWarnings("unchecked")
Map<String, String> arguments = (Map<String, String>) call.arguments;
Map<String, String> arguments = call.arguments();
String authToken = arguments.get("authToken");
String authTokenSecret = arguments.get("authTokenSecret");
AuthCredential credential = TwitterAuthProvider.getCredential(authToken, authTokenSecret);
Expand All @@ -406,8 +404,7 @@ private void handleLinkWithTwitterCredential(

private void handleSignInWithFacebook(
MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
@SuppressWarnings("unchecked")
Map<String, String> arguments = (Map<String, String>) call.arguments;
Map<String, String> arguments = call.arguments();
String accessToken = arguments.get("accessToken");
AuthCredential credential = FacebookAuthProvider.getCredential(accessToken);
firebaseAuth
Expand All @@ -434,14 +431,14 @@ private void handleSignInWithCustomToken(
.addOnCompleteListener(new SignInCompleteListener(result));
}

private void handleSignOut(MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
private void handleSignOut(
@SuppressWarnings("unused") MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
firebaseAuth.signOut();
result.success(null);
}

private void handleGetToken(MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
@SuppressWarnings("unchecked")
Map<String, Boolean> arguments = (Map<String, Boolean>) call.arguments;
Map<String, Boolean> arguments = call.arguments();
boolean refresh = arguments.get("refresh");
firebaseAuth
.getCurrentUser()
Expand All @@ -460,8 +457,7 @@ public void onComplete(@NonNull Task<GetTokenResult> task) {
}

private void handleUpdateEmail(MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
@SuppressWarnings("unchecked")
Map<String, String> arguments = (Map<String, String>) call.arguments;
Map<String, String> arguments = call.arguments();
firebaseAuth
.getCurrentUser()
.updateEmail(arguments.get("email"))
Expand All @@ -470,8 +466,7 @@ private void handleUpdateEmail(MethodCall call, final Result result, FirebaseAut

private void handleUpdatePassword(
MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
@SuppressWarnings("unchecked")
Map<String, String> arguments = (Map<String, String>) call.arguments;
Map<String, String> arguments = call.arguments();
firebaseAuth
.getCurrentUser()
.updatePassword(arguments.get("password"))
Expand All @@ -480,8 +475,7 @@ private void handleUpdatePassword(

private void handleUpdateProfile(
MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
@SuppressWarnings("unchecked")
Map<String, String> arguments = (Map<String, String>) call.arguments;
Map<String, String> arguments = call.arguments();

UserProfileChangeRequest.Builder builder = new UserProfileChangeRequest.Builder();
if (arguments.containsKey("displayName")) {
Expand All @@ -498,7 +492,7 @@ private void handleUpdateProfile(
}

private void handleStartListeningAuthState(
MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
@SuppressWarnings("unused") MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
final int handle = nextHandle++;
FirebaseAuth.AuthStateListener listener =
new FirebaseAuth.AuthStateListener() {
Expand Down Expand Up @@ -540,8 +534,7 @@ private void handleStopListeningAuthState(

private void handleSetLanguageCode(
MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
@SuppressWarnings("unchecked")
Map<String, String> arguments = (Map<String, String>) call.arguments;
Map<String, String> arguments = call.arguments();
String language = arguments.get("language");

firebaseAuth.setLanguageCode(language);
Expand Down Expand Up @@ -586,20 +579,21 @@ public void onComplete(@NonNull Task<Void> task) {
}
}

private class ProvidersCompleteListener implements OnCompleteListener<ProviderQueryResult> {
private class SignInMethodCompleteListener
implements OnCompleteListener<SignInMethodQueryResult> {
private final Result result;

ProvidersCompleteListener(Result result) {
SignInMethodCompleteListener(Result result) {
this.result = result;
}

@Override
public void onComplete(@NonNull Task<ProviderQueryResult> task) {
public void onComplete(@NonNull Task<SignInMethodQueryResult> task) {
if (!task.isSuccessful()) {
Exception e = task.getException();
result.error(ERROR_REASON_EXCEPTION, e.getMessage(), null);
} else {
List<String> providers = task.getResult().getProviders();
List<String> providers = task.getResult().getSignInMethods();
result.success(providers);
}
}
Expand Down