From 04f33f7cca7283cb29cc19eebba3d1c370c32fdd Mon Sep 17 00:00:00 2001
From: Caren Chang <carenc@google.com>
Date: Fri, 10 Jun 2022 10:53:01 -0700
Subject: [PATCH] Fix nullable function call when retrieving locale

---
 .../apps/nowinandroid/core/ui/NewsResourceCard.kt      | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/core-ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt b/core-ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt
index d31f988ce..718840d17 100644
--- a/core-ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt
+++ b/core-ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt
@@ -156,8 +156,14 @@ fun NewsResourceAuthors(
     if (authors.isNotEmpty()) {
         // Only display first author for now
         val author = authors[0]
-        val authorNameFormatted =
-            author.name.uppercase(ConfigurationCompat.getLocales(LocalConfiguration.current).get(0))
+
+        val locale = ConfigurationCompat.getLocales(LocalConfiguration.current).get(0)
+
+        val authorNameFormatted = if (locale != null) {
+            author.name.uppercase(locale)
+        } else {
+            author.name.uppercase()
+        }
 
         val authorImageUrl = author.imageUrl