From 72d2e97363d89d716963dd224a2b9578ba446624 Mon Sep 17 00:00:00 2001 From: Guillaume Bernos Date: Thu, 5 Jan 2023 13:45:28 +0100 Subject: [PATCH] fix(auth, android): fix a null pointer exception that could occur when removing an even listener (#10210) --- .../plugins/firebase/auth/FlutterFirebaseAuthPlugin.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/firebase_auth/firebase_auth/android/src/main/java/io/flutter/plugins/firebase/auth/FlutterFirebaseAuthPlugin.java b/packages/firebase_auth/firebase_auth/android/src/main/java/io/flutter/plugins/firebase/auth/FlutterFirebaseAuthPlugin.java index 1c72507c1b4e..f0d4aca85001 100755 --- a/packages/firebase_auth/firebase_auth/android/src/main/java/io/flutter/plugins/firebase/auth/FlutterFirebaseAuthPlugin.java +++ b/packages/firebase_auth/firebase_auth/android/src/main/java/io/flutter/plugins/firebase/auth/FlutterFirebaseAuthPlugin.java @@ -1822,7 +1822,9 @@ public Task didReinitializeFirebaseCore() { private void removeEventListeners() { for (EventChannel eventChannel : streamHandlers.keySet()) { StreamHandler streamHandler = streamHandlers.get(eventChannel); - streamHandler.onCancel(null); + if (streamHandler != null) { + streamHandler.onCancel(null); + } eventChannel.setStreamHandler(null); } streamHandlers.clear();