Render notes with HTML correctly

hueachilles · hueachilles · commit 5e0b66f55deb · 2025-10-17T15:55:04.000-04:00
diff --git a/core/addresssearch/src/main/java/com/crisiscleanup/core/addresssearch/GooglePlaceAddressSearchRepository.kt b/core/addresssearch/src/main/java/com/crisiscleanup/core/addresssearch/GooglePlaceAddressSearchRepository.kt
@@ -51,7 +51,10 @@ class GooglePlaceAddressSearchRepository @Inject constructor(
     private suspend fun placesClient(): PlacesClient {
         placesClientMutex.withLock {
             if (placesClientInternal == null) {
-                Places.initialize(context, settingsProvider.mapsApiKey)
+                Places.initializeWithNewPlacesApiEnabled(
+                    context,
+                    settingsProvider.mapsApiKey,
+                )
                 placesClientInternal = Places.createClient(context)
             }
         }
diff --git a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/NotesFlagsScreen.kt b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/NotesFlagsScreen.kt
@@ -54,7 +54,8 @@ internal fun NoteView(
         }
         var noteText = note.note
         if (noteText.contains('<') &&
-            noteText.contains('>')
+            noteText.contains('>') ||
+            noteText.contains("&#")
         ) {
             noteText = HtmlCompat.fromHtml(noteText, HtmlCompat.FROM_HTML_MODE_COMPACT).toString()
         }

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,10 @@ class GooglePlaceAddressSearchRepository @Inject constructor(`
`51`	`51`	`private suspend fun placesClient(): PlacesClient {`
`52`	`52`	`placesClientMutex.withLock {`
`53`	`53`	`if (placesClientInternal == null) {`
`54`		`- Places.initialize(context, settingsProvider.mapsApiKey)`
	`54`	`+ Places.initializeWithNewPlacesApiEnabled(`
	`55`	`+ context,`
	`56`	`+ settingsProvider.mapsApiKey,`
	`57`	`+ )`
`55`	`58`	`placesClientInternal = Places.createClient(context)`
`56`	`59`	`}`
`57`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,8 @@ internal fun NoteView(`
`54`	`54`	`}`
`55`	`55`	`var noteText = note.note`
`56`	`56`	`if (noteText.contains('<') &&`
`57`		`- noteText.contains('>')`
	`57`	`+ noteText.contains('>') \|\|`
	`58`	`+ noteText.contains("&#")`
`58`	`59`	`) {`
`59`	`60`	`noteText = HtmlCompat.fromHtml(noteText, HtmlCompat.FROM_HTML_MODE_COMPACT).toString()`
`60`	`61`	`}`