Fixed demo app crash by appropriately handing ResourceNotFoundException.

demo/src/main/java/com/google/android/fhir/demo/FhirApplication.kt

@@ -26,6 +26,7 @@ import com.google.android.fhir.NetworkConfiguration
 import com.google.android.fhir.ServerConfiguration
 import com.google.android.fhir.datacapture.DataCaptureConfig
 import com.google.android.fhir.datacapture.XFhirQueryResolver
+import com.google.android.fhir.db.ResourceNotFoundException
 import com.google.android.fhir.search.search
 import com.google.android.fhir.sync.remote.HttpLogger
 import timber.log.Timber
@@ -63,7 +64,14 @@ class FhirApplication : Application(), DataCaptureConfig.Provider {
  dataCaptureConfig =
  DataCaptureConfig().apply {
  urlResolver = ReferenceUrlResolver(this@FhirApplication as Context)
- xFhirQueryResolver = XFhirQueryResolver { fhirEngine.search(it).map { it.resource } }
+ xFhirQueryResolver = XFhirQueryResolver {
+ try {
+ fhirEngine.search(it).map { it.resource }
+ } catch (e: ResourceNotFoundException) {
+ Timber.e(e)
+ emptyList()
+ }
+ }
  }
  }
 

demo/src/main/java/com/google/android/fhir/demo/ReferenceUrlResolver.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Google LLC
+ * Copyright 2022-2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,16 +20,23 @@ import android.content.Context
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
 import com.google.android.fhir.datacapture.UrlResolver
+import com.google.android.fhir.db.ResourceNotFoundException
 import com.google.android.fhir.get
 import org.hl7.fhir.r4.model.Binary
 import org.hl7.fhir.r4.model.ResourceType
+import timber.log.Timber
 
 class ReferenceUrlResolver(val context: Context) : UrlResolver {
 
  override suspend fun resolveBitmapUrl(url: String): Bitmap? {
  val logicalId = getLogicalIdFromFhirUrl(url, ResourceType.Binary)
- val binary = FhirApplication.fhirEngine(context).get<Binary>(logicalId)
- return BitmapFactory.decodeByteArray(binary.data, 0, binary.data.size)
+ return try {
+ val binary = FhirApplication.fhirEngine(context).get<Binary>(logicalId)
+ BitmapFactory.decodeByteArray(binary.data, 0, binary.data.size)
+ } catch (e: ResourceNotFoundException) {
+ Timber.e(e)
+ null
+ }
  }
 }