From 57f99cb034e6b7c246fc612959a02a9856254f5c Mon Sep 17 00:00:00 2001
From: Russell Cullen <russellcullen@nypl.org>
Date: Tue, 22 Aug 2023 12:37:04 -0400
Subject: [PATCH] Fix

---
 .../org/nypl/simplified/cardcreator/ui/LocationFragment.kt  | 6 +++---
 .../simplified/ui/accounts/AccountListRegistryFragment.kt   | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/simplified-cardcreator/src/main/java/org/nypl/simplified/cardcreator/ui/LocationFragment.kt b/simplified-cardcreator/src/main/java/org/nypl/simplified/cardcreator/ui/LocationFragment.kt
index 04fa02db2..317974850 100644
--- a/simplified-cardcreator/src/main/java/org/nypl/simplified/cardcreator/ui/LocationFragment.kt
+++ b/simplified-cardcreator/src/main/java/org/nypl/simplified/cardcreator/ui/LocationFragment.kt
@@ -107,7 +107,7 @@ class LocationFragment : Fragment(), LocationListener {
       if (isNewYork || locationMock != null) {
         locationMock?.let { location ->
           activityModel.userLocationAddress =
-            geocoder.getFromLocation(location.latitude, location.longitude, 1)[0]
+            geocoder.getFromLocation(location.latitude, location.longitude, 1)?.get(0)
         }
 
         logger.debug("User navigated to the next screen")
@@ -230,7 +230,7 @@ class LocationFragment : Fragment(), LocationListener {
 
     try {
       if (location != null) {
-        address = geocoder.getFromLocation(location.latitude, location.longitude, maxResults)[0]
+        address = geocoder.getFromLocation(location.latitude, location.longitude, maxResults)!![0]
         logger.debug("Region is: ${address.adminArea} ${address.countryCode} ")
         binding.regionEt.setText("${address.adminArea} ${address.countryCode}", TextView.BufferType.EDITABLE)
 
@@ -292,7 +292,7 @@ class LocationFragment : Fragment(), LocationListener {
     val address: Address?
 
     try {
-      address = geocoder.getFromLocation(location.latitude, location.longitude, maxResults)[0]
+      address = geocoder.getFromLocation(location.latitude, location.longitude, maxResults)!![0]
       logger.debug("Region is: ${address.adminArea} ${address.countryCode} ")
       binding.regionEt.setText("${address.adminArea} ${address.countryCode}", TextView.BufferType.EDITABLE)
 
diff --git a/simplified-ui-accounts/src/main/java/org/nypl/simplified/ui/accounts/AccountListRegistryFragment.kt b/simplified-ui-accounts/src/main/java/org/nypl/simplified/ui/accounts/AccountListRegistryFragment.kt
index 75b169309..9196840a4 100644
--- a/simplified-ui-accounts/src/main/java/org/nypl/simplified/ui/accounts/AccountListRegistryFragment.kt
+++ b/simplified-ui-accounts/src/main/java/org/nypl/simplified/ui/accounts/AccountListRegistryFragment.kt
@@ -192,12 +192,12 @@ class AccountListRegistryFragment : Fragment(R.layout.account_list_registry) {
     })
 
     search.setOnActionExpandListener(object : OnActionExpandListener {
-      override fun onMenuItemActionExpand(item: MenuItem?): Boolean {
+      override fun onMenuItemActionExpand(item: MenuItem): Boolean {
         // Do nothing
         return true
       }
 
-      override fun onMenuItemActionCollapse(item: MenuItem?): Boolean {
+      override fun onMenuItemActionCollapse(item: MenuItem): Boolean {
         this@AccountListRegistryFragment.accountListAdapter.resetFilter()
         return true
       }