fix android

Author: Lyokone

packages/firebase_auth/firebase_auth/android/src/main/java/io/flutter/plugins/firebase/auth/AuthStateChannelStreamHandler.java

@@ -43,7 +43,7 @@ public void onListen(Object arguments, EventSink events) {
  if (user == null) {
  event.put(Constants.USER, null);
  } else {
- event.put(Constants.USER, PigeonParser.parseFirebaseUser(user).toList());
+ event.put(Constants.USER, PigeonParser.manuallyToList(PigeonParser.parseFirebaseUser(user)));
  }
 
  events.success(event);

packages/firebase_auth/firebase_auth/android/src/main/java/io/flutter/plugins/firebase/auth/FlutterFirebaseAuthPlugin.java

@@ -33,6 +33,8 @@
 import io.flutter.plugin.common.MethodChannel;
 import io.flutter.plugins.firebase.core.FlutterFirebaseCorePlugin;
 import io.flutter.plugins.firebase.core.FlutterFirebasePlugin;
+
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -697,8 +699,7 @@ public Task<Map<String, Object>> getPluginConstantsForFirebaseApp(FirebaseApp fi
  }
 
  if (user != null) {
- final Object parsedUser = user.toList();
- constants.put("APP_CURRENT_USER", parsedUser);
+ constants.put("APP_CURRENT_USER", PigeonParser.manuallyToList(user));
  }
 
  taskCompletionSource.setResult(constants);

packages/firebase_auth/firebase_auth/android/src/main/java/io/flutter/plugins/firebase/auth/IdTokenChannelStreamHandler.java

@@ -43,7 +43,7 @@ public void onListen(Object arguments, EventSink events) {
  if (user == null) {
  event.put(Constants.USER, null);
  } else {
- event.put(Constants.USER, PigeonParser.parseFirebaseUser(user).toList());
+ event.put(Constants.USER, PigeonParser.manuallyToList(PigeonParser.parseFirebaseUser(user)));
  }
 
  events.success(event);

packages/firebase_auth/firebase_auth/android/src/main/java/io/flutter/plugins/firebase/auth/PigeonParser.java

@@ -38,6 +38,13 @@
 import java.util.Objects;
 
 public class PigeonParser {
+ static List<Object> manuallyToList(GeneratedAndroidFirebaseAuth.PigeonUserDetails pigeonUserDetails) {
+ List<Object> output = new ArrayList<>();
+ output.add(pigeonUserDetails.getUserInfo().toList());
+ output.add(pigeonUserDetails.getProviderData());
+ return output;
+ }
+
  static GeneratedAndroidFirebaseAuth.PigeonUserCredential parseAuthResult(
  @NonNull AuthResult authResult) {
  GeneratedAndroidFirebaseAuth.PigeonUserCredential.Builder builder =

packages/firebase_auth/firebase_auth_platform_interface/lib/src/method_channel/method_channel_firebase_auth.dart

@@ -136,13 +136,18 @@ class MethodChannelFirebaseAuth extends FirebaseAuthPlatform {
  _multiFactorInstances[appName] = multiFactorInstance;
  }
 
- final userMap = arguments['user'];
- if (userMap == null) {
+ final userList = arguments['user'];
+ if (userList == null) {
  instance.currentUser = null;
  streamController.add(const _ValueWrapper.absent());
  } else {
  final MethodChannelUser user = MethodChannelUser(
- instance, multiFactorInstance, PigeonUserDetails.decode(userMap));
+ instance,
+ multiFactorInstance,
+ PigeonUserDetails.decode(
+ [PigeonUserInfo.decode(userList[0]!), userList[1]],
+ ),
+ );
 
  instance.currentUser = user;
  streamController.add(_ValueWrapper(instance.currentUser));
@@ -170,14 +175,19 @@ class MethodChannelFirebaseAuth extends FirebaseAuthPlatform {
  _multiFactorInstances[appName] = multiFactorInstance;
  }
 
- final userMap = arguments['user'];
- if (userMap == null) {
+ final userList = arguments['user'];
+ if (userList == null) {
  instance.currentUser = null;
  idTokenStreamController.add(const _ValueWrapper.absent());
  userChangesStreamController.add(const _ValueWrapper.absent());
  } else {
  final MethodChannelUser user = MethodChannelUser(
- instance, multiFactorInstance, PigeonUserDetails.decode(userMap));
+ instance,
+ multiFactorInstance,
+ PigeonUserDetails.decode(
+ [PigeonUserInfo.decode(userList[0]!), userList[1]],
+ ),
+ );
 
  instance.currentUser = user;
  idTokenStreamController.add(_ValueWrapper(user));

packages/firebase_auth/firebase_auth_platform_interface/lib/src/platform_interface/platform_interface_firebase_auth.dart

@@ -64,7 +64,9 @@ abstract class FirebaseAuthPlatform extends PlatformInterface {
 
  if (currentUser != null) {
  currentUser as List<Object?>;
- currentUser = PigeonUserDetails.decode(currentUser);
+ final firstElement = PigeonUserInfo.decode(currentUser[0]!);
+ final secondElement = currentUser[1]!;
+ currentUser = PigeonUserDetails.decode([firstElement, secondElement]);
  }
  return FirebaseAuthPlatform.instance.delegateFor(app: app).setInitialValues(
  languageCode: pluginConstants['APP_LANGUAGE_CODE'],