Merge pull request eu-digital-identity-wallet#513 from niscy-eudiw/bugfix/fix_null_claim_value

Bugfix: Add null-safety for claim values

Author: stzouvaras

common-feature/src/main/java/eu/europa/ec/commonfeature/util/DocumentHelper.kt

@@ -370,17 +370,21 @@ private fun insertPath(
     return if (path.value.size == 1) {
         // Leaf node (Primitive or Nested Structure)
         if (existingNode == null && currentClaim != null) {
-            val accumulatedClaims: MutableList<ClaimDomain> = mutableListOf()
-            createKeyValue(
-                item = currentClaim.value!!,
-                groupKey = currentClaim.identifier,
-                resourceProvider = resourceProvider,
-                uuidProvider = uuidProvider,
-                claimMetaData = currentClaim.issuerMetadata,
-                disclosurePath = disclosurePath,
-                allItems = accumulatedClaims,
-            )
-            tree + accumulatedClaims
+            currentClaim.value?.let { safeClaimValue ->
+                val accumulatedClaims: MutableList<ClaimDomain> = mutableListOf()
+
+                createKeyValue(
+                    item = safeClaimValue,
+                    groupKey = currentClaim.identifier,
+                    resourceProvider = resourceProvider,
+                    uuidProvider = uuidProvider,
+                    claimMetaData = currentClaim.issuerMetadata,
+                    disclosurePath = disclosurePath,
+                    allItems = accumulatedClaims,
+                )
+
+                tree + accumulatedClaims
+            } ?: tree // No value to add (claim value is null), return unchanged
         } else {
             tree // Already exists or not available, return unchanged
         }

dashboard-feature/src/main/java/eu/europa/ec/dashboardfeature/interactor/TransactionDetailsInteractor.kt

@@ -193,33 +193,37 @@ class TransactionDetailsInteractorImpl(
             val domainClaims: MutableList<ClaimDomain> = mutableListOf()
 
             presentedDocument.claims.forEach { presentedClaim ->
-                val elementIdentifier = when (presentedDocument.format) {
-                    is MsoMdocFormat -> presentedClaim.path.last()
-                    is SdJwtVcFormat -> presentedClaim.path.joinToString(".")
-                }
+                presentedClaim.value?.let { safePresentedClaimValue ->
 
-                val claimType = when (presentedDocument.format) {
-                    is MsoMdocFormat -> ClaimType.MsoMdoc(
-                        namespace = presentedClaim.path.first()
-                    )
+                    val elementIdentifier = when (presentedDocument.format) {
+                        is MsoMdocFormat -> presentedClaim.path.last()
+                        is SdJwtVcFormat -> presentedClaim.path.joinToString(".")
+                    }
 
-                    is SdJwtVcFormat -> ClaimType.SdJwtVc
-                }
+                    val claimType = when (presentedDocument.format) {
+                        is MsoMdocFormat -> ClaimType.MsoMdoc(
+                            namespace = presentedClaim.path.first()
+                        )
 
-                val itemPath = when (presentedDocument.format) {
-                    is MsoMdocFormat -> listOf(elementIdentifier)
-                    is SdJwtVcFormat -> presentedClaim.path
-                }.toClaimPathDomain(type = claimType)
-
-                createKeyValue(
-                    item = presentedClaim.value!!,
-                    groupKey = elementIdentifier,
-                    disclosurePath = itemPath,
-                    resourceProvider = resourceProvider,
-                    claimMetaData = presentedClaim.metadata,
-                    allItems = domainClaims,
-                    uuidProvider = uuidProvider
-                )
+                        is SdJwtVcFormat -> ClaimType.SdJwtVc
+                    }
+
+                    val itemPath = when (presentedDocument.format) {
+                        is MsoMdocFormat -> listOf(elementIdentifier)
+                        is SdJwtVcFormat -> presentedClaim.path
+                    }.toClaimPathDomain(type = claimType)
+
+
+                    createKeyValue(
+                        item = safePresentedClaimValue,
+                        groupKey = elementIdentifier,
+                        disclosurePath = itemPath,
+                        resourceProvider = resourceProvider,
+                        claimMetaData = presentedClaim.metadata,
+                        allItems = domainClaims,
+                        uuidProvider = uuidProvider
+                    )
+                }
             }
 
             val uniqueId = itemIdentifierPrefix + index