@@ -145,8 +145,7 @@ public void onMethodCall(MethodCall call, Result result) {
145145 }
146146
147147 private void handleSignInWithPhoneNumber (MethodCall call , Result result ) {
148- @ SuppressWarnings ("unchecked" )
149- Map <String , String > arguments = (Map <String , String >) call .arguments ;
148+ Map <String , String > arguments = call .arguments ();
150149 String verificationId = arguments .get ("verificationId" );
151150 String smsCode = arguments .get ("smsCode" );
152151
@@ -158,7 +157,6 @@ private void handleSignInWithPhoneNumber(MethodCall call, Result result) {
158157 }
159158
160159 private void handleVerifyPhoneNumber (MethodCall call , Result result ) {
161- @ SuppressWarnings ("unchecked" )
162160 final int handle = call .argument ("handle" );
163161 String phoneNumber = call .argument ("phoneNumber" );
164162 int timeout = call .argument ("timeout" );
@@ -230,6 +228,7 @@ public void onCodeAutoRetrievalTimeOut(String verificationId) {
230228 registrar .activity (),
231229 verificationCallbacks );
232230 }
231+ result .success (null );
233232 }
234233
235234 private Map <String , Object > getVerifyPhoneNumberExceptionMap (FirebaseException e ) {
@@ -251,8 +250,7 @@ private Map<String, Object> getVerifyPhoneNumberExceptionMap(FirebaseException e
251250 }
252251
253252 private void handleLinkWithEmailAndPassword (MethodCall call , Result result ) {
254- @ SuppressWarnings ("unchecked" )
255- Map <String , String > arguments = (Map <String , String >) call .arguments ;
253+ Map <String , String > arguments = call .arguments ();
256254 String email = arguments .get ("email" );
257255 String password = arguments .get ("password" );
258256
@@ -263,7 +261,7 @@ private void handleLinkWithEmailAndPassword(MethodCall call, Result result) {
263261 .addOnCompleteListener (new SignInCompleteListener (result ));
264262 }
265263
266- private void handleCurrentUser (MethodCall call , final Result result ) {
264+ private void handleCurrentUser (@ SuppressWarnings ( "unused" ) MethodCall call , final Result result ) {
267265 final FirebaseAuth .AuthStateListener listener =
268266 new FirebaseAuth .AuthStateListener () {
269267 @ Override
@@ -278,13 +276,13 @@ public void onAuthStateChanged(@NonNull FirebaseAuth firebaseAuth) {
278276 firebaseAuth .addAuthStateListener (listener );
279277 }
280278
281- private void handleSignInAnonymously (MethodCall call , final Result result ) {
279+ private void handleSignInAnonymously (
280+ @ SuppressWarnings ("unused" ) MethodCall call , final Result result ) {
282281 firebaseAuth .signInAnonymously ().addOnCompleteListener (new SignInCompleteListener (result ));
283282 }
284283
285284 private void handleCreateUserWithEmailAndPassword (MethodCall call , final Result result ) {
286- @ SuppressWarnings ("unchecked" )
287- Map <String , String > arguments = (Map <String , String >) call .arguments ;
285+ Map <String , String > arguments = call .arguments ();
288286 String email = arguments .get ("email" );
289287 String password = arguments .get ("password" );
290288
@@ -294,49 +292,47 @@ private void handleCreateUserWithEmailAndPassword(MethodCall call, final Result
294292 }
295293
296294 private void handleFetchProvidersForEmail (MethodCall call , final Result result ) {
297- @ SuppressWarnings ("unchecked" )
298- Map <String , String > arguments = (Map <String , String >) call .arguments ;
295+ Map <String , String > arguments = call .arguments ();
299296 String email = arguments .get ("email" );
300297
301298 firebaseAuth
302- .fetchProvidersForEmail (email )
303- .addOnCompleteListener (new ProvidersCompleteListener (result ));
299+ .fetchSignInMethodsForEmail (email )
300+ .addOnCompleteListener (new SignInMethodCompleteListener (result ));
304301 }
305302
306303 private void handleSendPasswordResetEmail (MethodCall call , final Result result ) {
307- @ SuppressWarnings ("unchecked" )
308- Map <String , String > arguments = (Map <String , String >) call .arguments ;
304+ Map <String , String > arguments = call .arguments ();
309305 String email = arguments .get ("email" );
310306
311307 firebaseAuth
312308 .sendPasswordResetEmail (email )
313309 .addOnCompleteListener (new TaskVoidCompleteListener (result ));
314310 }
315311
316- private void handleSendEmailVerification (MethodCall call , final Result result ) {
312+ private void handleSendEmailVerification (
313+ @ SuppressWarnings ("unused" ) MethodCall call , final Result result ) {
317314 firebaseAuth
318315 .getCurrentUser ()
319316 .sendEmailVerification ()
320317 .addOnCompleteListener (new TaskVoidCompleteListener (result ));
321318 }
322319
323- private void handleReload (MethodCall call , final Result result ) {
320+ private void handleReload (@ SuppressWarnings ( "unused" ) MethodCall call , final Result result ) {
324321 firebaseAuth
325322 .getCurrentUser ()
326323 .reload ()
327324 .addOnCompleteListener (new TaskVoidCompleteListener (result ));
328325 }
329326
330- private void handleDelete (MethodCall call , final Result result ) {
327+ private void handleDelete (@ SuppressWarnings ( "unused" ) MethodCall call , final Result result ) {
331328 firebaseAuth
332329 .getCurrentUser ()
333330 .delete ()
334331 .addOnCompleteListener (new TaskVoidCompleteListener (result ));
335332 }
336333
337334 private void handleSignInWithEmailAndPassword (MethodCall call , final Result result ) {
338- @ SuppressWarnings ("unchecked" )
339- Map <String , String > arguments = (Map <String , String >) call .arguments ;
335+ Map <String , String > arguments = call .arguments ();
340336 String email = arguments .get ("email" );
341337 String password = arguments .get ("password" );
342338
@@ -346,8 +342,7 @@ private void handleSignInWithEmailAndPassword(MethodCall call, final Result resu
346342 }
347343
348344 private void handleSignInWithGoogle (MethodCall call , final Result result ) {
349- @ SuppressWarnings ("unchecked" )
350- Map <String , String > arguments = (Map <String , String >) call .arguments ;
345+ Map <String , String > arguments = call .arguments ();
351346 String idToken = arguments .get ("idToken" );
352347 String accessToken = arguments .get ("accessToken" );
353348 AuthCredential credential = GoogleAuthProvider .getCredential (idToken , accessToken );
@@ -357,8 +352,7 @@ private void handleSignInWithGoogle(MethodCall call, final Result result) {
357352 }
358353
359354 private void handleLinkWithGoogleCredential (MethodCall call , final Result result ) {
360- @ SuppressWarnings ("unchecked" )
361- Map <String , String > arguments = (Map <String , String >) call .arguments ;
355+ Map <String , String > arguments = call .arguments ();
362356 String idToken = arguments .get ("idToken" );
363357 String accessToken = arguments .get ("accessToken" );
364358 AuthCredential credential = GoogleAuthProvider .getCredential (idToken , accessToken );
@@ -369,8 +363,7 @@ private void handleLinkWithGoogleCredential(MethodCall call, final Result result
369363 }
370364
371365 private void handleLinkWithFacebookCredential (MethodCall call , final Result result ) {
372- @ SuppressWarnings ("unchecked" )
373- Map <String , String > arguments = (Map <String , String >) call .arguments ;
366+ Map <String , String > arguments = call .arguments ();
374367 String accessToken = arguments .get ("accessToken" );
375368 AuthCredential credential = FacebookAuthProvider .getCredential (accessToken );
376369 firebaseAuth
@@ -380,8 +373,7 @@ private void handleLinkWithFacebookCredential(MethodCall call, final Result resu
380373 }
381374
382375 private void handleLinkWithTwitterCredential (MethodCall call , final Result result ) {
383- @ SuppressWarnings ("unchecked" )
384- Map <String , String > arguments = (Map <String , String >) call .arguments ;
376+ Map <String , String > arguments = call .arguments ();
385377 String authToken = arguments .get ("authToken" );
386378 String authTokenSecret = arguments .get ("authTokenSecret" );
387379 AuthCredential credential = TwitterAuthProvider .getCredential (authToken , authTokenSecret );
@@ -392,8 +384,7 @@ private void handleLinkWithTwitterCredential(MethodCall call, final Result resul
392384 }
393385
394386 private void handleSignInWithFacebook (MethodCall call , final Result result ) {
395- @ SuppressWarnings ("unchecked" )
396- Map <String , String > arguments = (Map <String , String >) call .arguments ;
387+ Map <String , String > arguments = call .arguments ();
397388 String accessToken = arguments .get ("accessToken" );
398389 AuthCredential credential = FacebookAuthProvider .getCredential (accessToken );
399390 firebaseAuth
@@ -418,14 +409,13 @@ private void handleSignInWithCustomToken(MethodCall call, final Result result) {
418409 .addOnCompleteListener (new SignInCompleteListener (result ));
419410 }
420411
421- private void handleSignOut (MethodCall call , final Result result ) {
412+ private void handleSignOut (@ SuppressWarnings ( "unused" ) MethodCall call , final Result result ) {
422413 firebaseAuth .signOut ();
423414 result .success (null );
424415 }
425416
426417 private void handleGetToken (MethodCall call , final Result result ) {
427- @ SuppressWarnings ("unchecked" )
428- Map <String , Boolean > arguments = (Map <String , Boolean >) call .arguments ;
418+ Map <String , Boolean > arguments = call .arguments ();
429419 boolean refresh = arguments .get ("refresh" );
430420 firebaseAuth
431421 .getCurrentUser ()
@@ -444,26 +434,23 @@ public void onComplete(@NonNull Task<GetTokenResult> task) {
444434 }
445435
446436 private void handleUpdateEmail (MethodCall call , final Result result ) {
447- @ SuppressWarnings ("unchecked" )
448- Map <String , String > arguments = (Map <String , String >) call .arguments ;
437+ Map <String , String > arguments = call .arguments ();
449438 firebaseAuth
450439 .getCurrentUser ()
451440 .updateEmail (arguments .get ("email" ))
452441 .addOnCompleteListener (new TaskVoidCompleteListener (result ));
453442 }
454443
455444 private void handleUpdatePassword (MethodCall call , final Result result ) {
456- @ SuppressWarnings ("unchecked" )
457- Map <String , String > arguments = (Map <String , String >) call .arguments ;
445+ Map <String , String > arguments = call .arguments ();
458446 firebaseAuth
459447 .getCurrentUser ()
460448 .updatePassword (arguments .get ("password" ))
461449 .addOnCompleteListener (new TaskVoidCompleteListener (result ));
462450 }
463451
464452 private void handleUpdateProfile (MethodCall call , final Result result ) {
465- @ SuppressWarnings ("unchecked" )
466- Map <String , String > arguments = (Map <String , String >) call .arguments ;
453+ Map <String , String > arguments = call .arguments ();
467454
468455 UserProfileChangeRequest .Builder builder = new UserProfileChangeRequest .Builder ();
469456 if (arguments .containsKey ("displayName" )) {
@@ -479,7 +466,8 @@ private void handleUpdateProfile(MethodCall call, final Result result) {
479466 .addOnCompleteListener (new TaskVoidCompleteListener (result ));
480467 }
481468
482- private void handleStartListeningAuthState (MethodCall call , final Result result ) {
469+ private void handleStartListeningAuthState (
470+ @ SuppressWarnings ("unused" ) MethodCall call , final Result result ) {
483471 final int handle = nextHandle ++;
484472 FirebaseAuth .AuthStateListener listener =
485473 new FirebaseAuth .AuthStateListener () {
@@ -519,8 +507,7 @@ private void handleStopListeningAuthState(MethodCall call, final Result result)
519507 }
520508
521509 private void handleSetLanguageCode (MethodCall call , final Result result ) {
522- @ SuppressWarnings ("unchecked" )
523- Map <String , String > arguments = (Map <String , String >) call .arguments ;
510+ Map <String , String > arguments = call .arguments ();
524511 String language = arguments .get ("language" );
525512
526513 firebaseAuth .setLanguageCode (language );
@@ -565,20 +552,21 @@ public void onComplete(@NonNull Task<Void> task) {
565552 }
566553 }
567554
568- private class ProvidersCompleteListener implements OnCompleteListener <ProviderQueryResult > {
555+ private class SignInMethodCompleteListener
556+ implements OnCompleteListener <SignInMethodQueryResult > {
569557 private final Result result ;
570558
571- ProvidersCompleteListener (Result result ) {
559+ SignInMethodCompleteListener (Result result ) {
572560 this .result = result ;
573561 }
574562
575563 @ Override
576- public void onComplete (@ NonNull Task <ProviderQueryResult > task ) {
564+ public void onComplete (@ NonNull Task <SignInMethodQueryResult > task ) {
577565 if (!task .isSuccessful ()) {
578566 Exception e = task .getException ();
579567 result .error (ERROR_REASON_EXCEPTION , e .getMessage (), null );
580568 } else {
581- List <String > providers = task .getResult ().getProviders ();
569+ List <String > providers = task .getResult ().getSignInMethods ();
582570 result .success (providers );
583571 }
584572 }
0 commit comments