Fix incorrect handling of missing attrs in ID proofs (#20)

- Fix always showing reveal ID attrs provable - Fix showing "???" for missing ID attrs
Concordium · Mar 29, 2024 · 7741ea0 · 7741ea0
1 parent 623e7f7
commit 7741ea0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/app/src/main/java/com/concordium/wallet/data/util/IdentityAttributeConverterUtil.kt b/app/src/main/java/com/concordium/wallet/data/util/IdentityAttributeConverterUtil.kt
@@ -35,7 +35,11 @@ object IdentityAttributeConverterUtil {
                     DateTimeUtil.convertLongDate(attributeValue)
             "idDocExpiresAt" ->
                     DateTimeUtil.convertLongDate(attributeValue)
-            else -> attributeValue
+            else ->
+                attributeValue
+                    .ifEmpty {
+                        context.getString(R.string.identity_attribute_unavailable)
+                    }
         }
     }
 

diff --git a/app/src/main/java/com/concordium/wallet/ui/walletconnect/DisplayStatements.kt b/app/src/main/java/com/concordium/wallet/ui/walletconnect/DisplayStatements.kt
@@ -20,7 +20,6 @@ import com.concordium.wallet.R
 import com.concordium.wallet.data.room.Identity
 import com.concordium.wallet.data.util.IdentityAttributeConverterUtil
 import com.concordium.wallet.databinding.FragmentWalletConnectIdentityProofSecretStatementBinding
-import com.concordium.wallet.databinding.FragmentWalletConnectIdentityProofStatementCardBinding
 import com.concordium.wallet.databinding.FragmentWalletConnectIdentityProofStatementsBinding
 import com.concordium.wallet.databinding.IdentityProofStatementLineBinding
 import com.concordium.wallet.util.DateTimeUtil
@@ -97,12 +96,12 @@ class DisplayStatements(context: Context, attrs: AttributeSet): LinearLayout(con
 
     private fun getRevealLine(statement: RevealStatement, attributes: Map<String, CredentialAttribute>): View {
         val revealBinding = createStatementLine()
-        val rawAttribute = attributes[statement.attributeTag]?.value ?: "???"
+        val rawAttribute = attributes[statement.attributeTag]?.value ?: ""
         // Assuming this is identity attributes
-        val pair = IdentityAttributeConverterUtil.convertAttribute(context, Pair(statement.attributeTag,rawAttribute))
+        val pair = IdentityAttributeConverterUtil.convertAttribute(context, Pair(statement.attributeTag, rawAttribute))
         revealBinding.attributeTag.text = pair.first
         revealBinding.attributeValue.text = pair.second
-        setStatementLine(revealBinding, pair.first, pair.second, true)
+        setStatementLine(revealBinding, pair.first, pair.second, rawAttribute.isNotEmpty())
 
         return revealBinding.root
     }