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

Commit 8bb4024

Browse files
committed
Resolve deprecated API warnings
* fetchProvidersForEmail => fetchSignInMethodsForEmail * ```(Map<String, String>) call.arguments``` => ```call.arguments()``` * Fix warnings with `unchecked` & `unuse`
1 parent a90c328 commit 8bb4024

File tree

1 file changed

+54
-60
lines changed

1 file changed

+54
-60
lines changed

packages/firebase_auth/android/src/main/java/io/flutter/plugins/firebaseauth/FirebaseAuthPlugin.java

Lines changed: 54 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ private FirebaseAuthPlugin(PluginRegistry.Registrar registrar, MethodChannel cha
5353
}
5454

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

152152
private void handleSignInWithPhoneNumber(
153153
MethodCall call, Result result, FirebaseAuth firebaseAuth) {
154-
@SuppressWarnings("unchecked")
155-
Map<String, String> arguments = (Map<String, String>) call.arguments;
154+
Map<String, String> arguments = call.arguments();
156155
String verificationId = arguments.get("verificationId");
157156
String smsCode = arguments.get("smsCode");
158157

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

166165
private void handleVerifyPhoneNumber(
167166
MethodCall call, Result result, final FirebaseAuth firebaseAuth) {
168-
@SuppressWarnings("unchecked")
169167
final int handle = call.argument("handle");
170168
String phoneNumber = call.argument("phoneNumber");
171169
int timeout = call.argument("timeout");
@@ -237,6 +235,7 @@ public void onCodeAutoRetrievalTimeOut(String verificationId) {
237235
registrar.activity(),
238236
verificationCallbacks);
239237
}
238+
result.success(null);
240239
}
241240

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

260259
private void handleLinkWithEmailAndPassword(
261260
MethodCall call, Result result, FirebaseAuth firebaseAuth) {
262-
@SuppressWarnings("unchecked")
263-
Map<String, String> arguments = (Map<String, String>) call.arguments;
261+
Map<String, String> arguments = call.arguments();
264262
String email = arguments.get("email");
265263
String password = arguments.get("password");
266264

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

274-
private void handleCurrentUser(MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
275-
FirebaseUser user = firebaseAuth.getCurrentUser();
276-
if (user == null) {
277-
result.success(null);
278-
return;
279-
}
280-
Map<String, Object> userMap = mapFromUser(user);
281-
result.success(userMap);
272+
private void handleCurrentUser(
273+
@SuppressWarnings("unused") MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
274+
final FirebaseAuth.AuthStateListener listener =
275+
new FirebaseAuth.AuthStateListener() {
276+
@Override
277+
public void onAuthStateChanged(@NonNull FirebaseAuth firebaseAuth) {
278+
firebaseAuth.removeAuthStateListener(this);
279+
FirebaseUser user = firebaseAuth.getCurrentUser();
280+
Map<String, Object> userMap = mapFromUser(user);
281+
result.success(userMap);
282+
}
283+
};
284+
285+
firebaseAuth.addAuthStateListener(listener);
282286
}
283287

284288
private void handleSignInAnonymously(
285-
MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
289+
@SuppressWarnings("unused") MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
286290
firebaseAuth.signInAnonymously().addOnCompleteListener(new SignInCompleteListener(result));
287291
}
288292

289293
private void handleCreateUserWithEmailAndPassword(
290294
MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
291-
@SuppressWarnings("unchecked")
292-
Map<String, String> arguments = (Map<String, String>) call.arguments;
295+
Map<String, String> arguments = call.arguments();
293296
String email = arguments.get("email");
294297
String password = arguments.get("password");
295298

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

301304
private void handleFetchProvidersForEmail(
302305
MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
303-
@SuppressWarnings("unchecked")
304-
Map<String, String> arguments = (Map<String, String>) call.arguments;
306+
Map<String, String> arguments = call.arguments();
305307
String email = arguments.get("email");
306308

307309
firebaseAuth
308-
.fetchProvidersForEmail(email)
309-
.addOnCompleteListener(new ProvidersCompleteListener(result));
310+
.fetchSignInMethodsForEmail(email)
311+
.addOnCompleteListener(new SignInMethodCompleteListener(result));
310312
}
311313

312314
private void handleSendPasswordResetEmail(
313315
MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
314-
@SuppressWarnings("unchecked")
315-
Map<String, String> arguments = (Map<String, String>) call.arguments;
316+
Map<String, String> arguments = call.arguments();
316317
String email = arguments.get("email");
317318

318319
firebaseAuth
@@ -321,24 +322,32 @@ private void handleSendPasswordResetEmail(
321322
}
322323

323324
private void handleSendEmailVerification(
324-
MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
325+
@SuppressWarnings("unused") MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
325326
firebaseAuth
326327
.getCurrentUser()
327328
.sendEmailVerification()
328329
.addOnCompleteListener(new TaskVoidCompleteListener(result));
329330
}
330331

331-
private void handleReload(MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
332+
private void handleReload(
333+
@SuppressWarnings("unused") MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
332334
firebaseAuth
333335
.getCurrentUser()
334336
.reload()
335337
.addOnCompleteListener(new TaskVoidCompleteListener(result));
336338
}
337339

340+
private void handleDelete(
341+
@SuppressWarnings("unused") MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
342+
firebaseAuth
343+
.getCurrentUser()
344+
.delete()
345+
.addOnCompleteListener(new TaskVoidCompleteListener(result));
346+
}
347+
338348
private void handleSignInWithEmailAndPassword(
339349
MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
340-
@SuppressWarnings("unchecked")
341-
Map<String, String> arguments = (Map<String, String>) call.arguments;
350+
Map<String, String> arguments = call.arguments();
342351
String email = arguments.get("email");
343352
String password = arguments.get("password");
344353

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

350-
private void handleDelete(MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
351-
firebaseAuth
352-
.getCurrentUser()
353-
.delete()
354-
.addOnCompleteListener(new TaskVoidCompleteListener(result));
355-
}
356-
357359
private void handleSignInWithGoogle(
358360
MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
359-
@SuppressWarnings("unchecked")
360-
Map<String, String> arguments = (Map<String, String>) call.arguments;
361+
Map<String, String> arguments = call.arguments();
361362
String idToken = arguments.get("idToken");
362363
String accessToken = arguments.get("accessToken");
363364
AuthCredential credential = GoogleAuthProvider.getCredential(idToken, accessToken);
@@ -368,8 +369,7 @@ private void handleSignInWithGoogle(
368369

369370
private void handleLinkWithGoogleCredential(
370371
MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
371-
@SuppressWarnings("unchecked")
372-
Map<String, String> arguments = (Map<String, String>) call.arguments;
372+
Map<String, String> arguments = call.arguments();
373373
String idToken = arguments.get("idToken");
374374
String accessToken = arguments.get("accessToken");
375375
AuthCredential credential = GoogleAuthProvider.getCredential(idToken, accessToken);
@@ -381,8 +381,7 @@ private void handleLinkWithGoogleCredential(
381381

382382
private void handleLinkWithFacebookCredential(
383383
MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
384-
@SuppressWarnings("unchecked")
385-
Map<String, String> arguments = (Map<String, String>) call.arguments;
384+
Map<String, String> arguments = call.arguments();
386385
String accessToken = arguments.get("accessToken");
387386
AuthCredential credential = FacebookAuthProvider.getCredential(accessToken);
388387
firebaseAuth
@@ -393,8 +392,7 @@ private void handleLinkWithFacebookCredential(
393392

394393
private void handleLinkWithTwitterCredential(
395394
MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
396-
@SuppressWarnings("unchecked")
397-
Map<String, String> arguments = (Map<String, String>) call.arguments;
395+
Map<String, String> arguments = call.arguments();
398396
String authToken = arguments.get("authToken");
399397
String authTokenSecret = arguments.get("authTokenSecret");
400398
AuthCredential credential = TwitterAuthProvider.getCredential(authToken, authTokenSecret);
@@ -406,8 +404,7 @@ private void handleLinkWithTwitterCredential(
406404

407405
private void handleSignInWithFacebook(
408406
MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
409-
@SuppressWarnings("unchecked")
410-
Map<String, String> arguments = (Map<String, String>) call.arguments;
407+
Map<String, String> arguments = call.arguments();
411408
String accessToken = arguments.get("accessToken");
412409
AuthCredential credential = FacebookAuthProvider.getCredential(accessToken);
413410
firebaseAuth
@@ -434,14 +431,14 @@ private void handleSignInWithCustomToken(
434431
.addOnCompleteListener(new SignInCompleteListener(result));
435432
}
436433

437-
private void handleSignOut(MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
434+
private void handleSignOut(
435+
@SuppressWarnings("unused") MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
438436
firebaseAuth.signOut();
439437
result.success(null);
440438
}
441439

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

462459
private void handleUpdateEmail(MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
463-
@SuppressWarnings("unchecked")
464-
Map<String, String> arguments = (Map<String, String>) call.arguments;
460+
Map<String, String> arguments = call.arguments();
465461
firebaseAuth
466462
.getCurrentUser()
467463
.updateEmail(arguments.get("email"))
@@ -470,8 +466,7 @@ private void handleUpdateEmail(MethodCall call, final Result result, FirebaseAut
470466

471467
private void handleUpdatePassword(
472468
MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
473-
@SuppressWarnings("unchecked")
474-
Map<String, String> arguments = (Map<String, String>) call.arguments;
469+
Map<String, String> arguments = call.arguments();
475470
firebaseAuth
476471
.getCurrentUser()
477472
.updatePassword(arguments.get("password"))
@@ -480,8 +475,7 @@ private void handleUpdatePassword(
480475

481476
private void handleUpdateProfile(
482477
MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
483-
@SuppressWarnings("unchecked")
484-
Map<String, String> arguments = (Map<String, String>) call.arguments;
478+
Map<String, String> arguments = call.arguments();
485479

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

500494
private void handleStartListeningAuthState(
501-
MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
495+
@SuppressWarnings("unused") MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
502496
final int handle = nextHandle++;
503497
FirebaseAuth.AuthStateListener listener =
504498
new FirebaseAuth.AuthStateListener() {
@@ -540,8 +534,7 @@ private void handleStopListeningAuthState(
540534

541535
private void handleSetLanguageCode(
542536
MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
543-
@SuppressWarnings("unchecked")
544-
Map<String, String> arguments = (Map<String, String>) call.arguments;
537+
Map<String, String> arguments = call.arguments();
545538
String language = arguments.get("language");
546539

547540
firebaseAuth.setLanguageCode(language);
@@ -586,20 +579,21 @@ public void onComplete(@NonNull Task<Void> task) {
586579
}
587580
}
588581

589-
private class ProvidersCompleteListener implements OnCompleteListener<ProviderQueryResult> {
582+
private class SignInMethodCompleteListener
583+
implements OnCompleteListener<SignInMethodQueryResult> {
590584
private final Result result;
591585

592-
ProvidersCompleteListener(Result result) {
586+
SignInMethodCompleteListener(Result result) {
593587
this.result = result;
594588
}
595589

596590
@Override
597-
public void onComplete(@NonNull Task<ProviderQueryResult> task) {
591+
public void onComplete(@NonNull Task<SignInMethodQueryResult> task) {
598592
if (!task.isSuccessful()) {
599593
Exception e = task.getException();
600594
result.error(ERROR_REASON_EXCEPTION, e.getMessage(), null);
601595
} else {
602-
List<String> providers = task.getResult().getProviders();
596+
List<String> providers = task.getResult().getSignInMethods();
603597
result.success(providers);
604598
}
605599
}

0 commit comments

Comments
 (0)