fix: android conflicts

MichaelVerdon · MichaelVerdon · commit 942340af6ffe · 2025-11-13T11:08:04.000Z
diff --git a/packages/firebase_database/firebase_database/android/src/main/kotlin/io/flutter/plugins/firebase/database/FirebaseDatabasePlugin.kt b/packages/firebase_database/firebase_database/android/src/main/kotlin/io/flutter/plugins/firebase/database/FirebaseDatabasePlugin.kt
@@ -458,8 +458,8 @@ class FirebaseDatabasePlugin :
     return taskCompletionSource.task
   }
 
-  override fun didReinitializeFirebaseCore(): Task<Void> {
-    val taskCompletionSource = TaskCompletionSource<Void>()
+  override fun didReinitializeFirebaseCore(): Task<Void?> {
+    val taskCompletionSource = TaskCompletionSource<Void?>()
 
     cachedThreadPool.execute {
       try {

Original file line number	Diff line number	Diff line change
`@@ -458,8 +458,8 @@ class FirebaseDatabasePlugin :`
`458`	`458`	`return taskCompletionSource.task`
`459`	`459`	`}`
`460`	`460`
`461`		`- override fun didReinitializeFirebaseCore(): Task<Void> {`
`462`		`- val taskCompletionSource = TaskCompletionSource<Void>()`
	`461`	`+ override fun didReinitializeFirebaseCore(): Task<Void?> {`
	`462`	`+ val taskCompletionSource = TaskCompletionSource<Void?>()`
`463`	`463`
`464`	`464`	`cachedThreadPool.execute {`
`465`	`465`	`try {`