improved null handling

David Motsonashvili · David Motsonashvili · commit 1219d9cc3e94 · 2025-09-03T10:17:27.000-07:00
diff --git a/firebase-ai/src/main/kotlin/com/google/firebase/ai/type/ImagenGenerationResponse.kt b/firebase-ai/src/main/kotlin/com/google/firebase/ai/type/ImagenGenerationResponse.kt
@@ -70,7 +70,10 @@ internal constructor(public val images: List<T>, public val filteredReason: Stri
     val scores: List<Double>? = null
   ) {
     internal fun toPublic(): Map<String, Double> {
-      return categories?.zip(scores!!)?.toMap() ?: emptyMap()
+      if (categories == null || scores == null) {
+        return emptyMap()
+      }
+      return categories.zip(scores).toMap()
     }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,10 @@ internal constructor(public val images: List<T>, public val filteredReason: Stri`
`70`	`70`	`val scores: List<Double>? = null`
`71`	`71`	`) {`
`72`	`72`	`internal fun toPublic(): Map<String, Double> {`
`73`		`- return categories?.zip(scores!!)?.toMap() ?: emptyMap()`
	`73`	`+ if (categories == null \|\| scores == null) {`
	`74`	`+ return emptyMap()`
	`75`	`+ }`
	`76`	`+ return categories.zip(scores).toMap()`
`74`	`77`	`}`
`75`	`78`	`}`
`76`	`79`	`}`