Added imports for generated serializer/deserializer functions. (#576)

Signed-off-by: Peter Sorotokin <sorotokin@gmail.com>

Author: sorotokin

cbor-processor/src/main/kotlin/com/android/identity/cbor/annotation/CborSerializable.kt

@@ -1,7 +1,7 @@
 package com.android.identity.cbor.annotation
 
 @Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.SOURCE)
+@Retention(AnnotationRetention.BINARY)
 annotation class CborSerializable(
     /**
      * Optional parameter for sealed class hierarchies to define the key that carries type id.

cbor-processor/src/main/kotlin/com/android/identity/cbor/processor/CborSymbolProcessor.kt

@@ -121,13 +121,14 @@ class CborSymbolProcessor(
             }
 
             emptyLine()
-            block("fun ${deserializerName(classDeclaration)}(dataItem: DataItem): $baseName") {
+            val deserializer = deserializerName(classDeclaration, true)
+            block("fun $deserializer(dataItem: DataItem): $baseName") {
                 val typeKey = getTypeKey(annotation)
                 line("val type = dataItem[\"$typeKey\"].asTstr")
                 block("return when (type)") {
                     for (subclass in subclasses) {
                         val typeId = getTypeId(classDeclaration, subclass)
-                        line("\"$typeId\" -> ${deserializerName(subclass)}(dataItem)")
+                        line("\"$typeId\" -> ${deserializerName(subclass, false)}(dataItem)")
                     }
                     line("else -> throw IllegalArgumentException(\"wrong type: \$type\")")
                 }
@@ -200,7 +201,8 @@ class CborSymbolProcessor(
             val dataItem = varName("dataItem")
 
             emptyLine()
-            block("fun ${deserializerName(classDeclaration)}($dataItem: DataItem): $baseName") {
+            val deserializer = deserializerName(classDeclaration, true)
+            block("fun $deserializer($dataItem: DataItem): $baseName") {
                 val constructorParameters = mutableListOf<String>()
                 classDeclaration.getAllProperties().forEach { property ->
                     val fieldName = property.simpleName.asString()
@@ -314,10 +316,16 @@ class CborSymbolProcessor(
         return null
     }
 
-    private fun deserializerName(classDeclaration: KSClassDeclaration): String {
+    private fun deserializerName(
+            classDeclaration: KSClassDeclaration, forDeclaration: Boolean): String {
         val baseName = classDeclaration.simpleName.asString()
         return if (hasCompanion(classDeclaration)) {
-            "${baseName}.Companion.fromDataItem"
+            if (forDeclaration) {
+                "${baseName}.Companion.fromDataItem"
+            } else {
+                // for call
+                "${baseName}.fromDataItem"
+            }
         } else {
             "${baseName}_fromDataItem"
         }
@@ -334,7 +342,8 @@ class CborSymbolProcessor(
         type: KSType
     ): String {
         val declaration = type.declaration
-        when (declaration.qualifiedName!!.asString()) {
+        val qualifiedName = declaration.qualifiedName!!.asString()
+        when (qualifiedName) {
             "kotlin.collections.Map" ->
                 with(codeBuilder) {
                     val map = varName("map")
@@ -388,6 +397,10 @@ class CborSymbolProcessor(
             ) {
                 "$code.name"
             } else {
+                codeBuilder.importQualifiedName(qualifiedName)
+                if (findAnnotation(declaration, annotationSerializable) != null) {
+                    codeBuilder.importFunctionName("toDataItem", declaration.packageName.asString())
+                }
                 "$code.toDataItem"
             }
         }
@@ -461,7 +474,12 @@ class CborSymbolProcessor(
                 "${typeRef(codeBuilder, type)}.valueOf($code.asTstr)"
             } else {
                 codeBuilder.importQualifiedName(qualifiedName)
-                "${deserializerName(declaration as KSClassDeclaration)}($code)"
+                val deserializer = deserializerName(declaration as KSClassDeclaration, false)
+                if (findAnnotation(declaration, annotationSerializable) != null) {
+                    val shortName = deserializer.substring(deserializer.lastIndexOf(".") + 1)
+                    codeBuilder.importFunctionName(shortName, declaration.packageName.asString())
+                }
+                "${deserializer}($code)"
             }
         }
     }

cbor-processor/src/main/kotlin/com/android/identity/cbor/processor/CodeBuilder.kt

@@ -15,11 +15,19 @@ import java.io.Writer
  */
 class CodeBuilder(
     private val classesToImport: MutableMap<String, String> = mutableMapOf(), // simple to fully qualified name
+    private val functionsToImport: MutableMap<String, MutableSet<String>> = mutableMapOf(),  // function name to package set
     private var indentDepth: Int = 0,
     private val varCounts: MutableMap<String, Int> = mutableMapOf()
 ) {
     private val code: MutableList<Any> = mutableListOf()
 
+    /**
+     * Add and import for a function from a given package.
+     */
+    fun importFunctionName(function: String, packageName: String) {
+        functionsToImport.computeIfAbsent(function) { mutableSetOf() }.add(packageName);
+    }
+
     /**
      * Add given class to import list, simple class name can then be used in the code
      * to refer to it.
@@ -66,7 +74,8 @@ class CodeBuilder(
      * called).
      */
     fun insertionPoint(): CodeBuilder {
-        val builder = CodeBuilder(classesToImport, indentDepth, varCounts)
+        val builder = CodeBuilder(
+            classesToImport, functionsToImport, indentDepth, varCounts)
         code.add(builder)
         return builder
     }
@@ -195,6 +204,11 @@ class CodeBuilder(
         classesToImport.forEach { (_, qualifiedName) ->
             file.write("import $qualifiedName\n")
         }
+        functionsToImport.forEach { (functionName, packageNames) ->
+            packageNames.forEach { packageName ->
+                file.write("import $packageName.$functionName\n")
+            }
+        }
         file.write("\n")
         writeCodeTo(file)
         file.close()

wallet/src/main/java/com/android/identity/issuance/evidence/EvidenceRequestCreatePassphrase.kt

@@ -11,10 +11,7 @@ import com.android.identity.securearea.PassphraseConstraints
  * @param length Length of the PIN
  */
 data class EvidenceRequestCreatePassphrase (
-    // TODO: use PassphraseConstraints instead when cbor-processor is fixed
-    val passphraseMinLength: Int,
-    val passphraseMaxLength: Int,
-    val passphraseRequireNumerical: Boolean,
+    val passphraseConstraints: PassphraseConstraints,
     val message: String,
     val verifyMessage: String,
     val assets: Map<String, ByteArray>,

wallet/src/main/java/com/android/identity/issuance/simple/SimpleIssuingAuthorityProofingGraph.kt

@@ -76,9 +76,7 @@ class SimpleIssuingAuthorityProofingGraph {
         passphraseConstraints: PassphraseConstraints,
     ) {
         val evidenceRequest = EvidenceRequestCreatePassphrase(
-            passphraseMinLength = passphraseConstraints.minLength,
-            passphraseMaxLength = passphraseConstraints.maxLength,
-            passphraseRequireNumerical = passphraseConstraints.requireNumerical,
+            passphraseConstraints = passphraseConstraints,
             message = message,
             verifyMessage = verifyMessage,
             assets = assets)

wallet/src/main/java/com/android/identity_credential/wallet/ui/destination/provisioncredential/EvidenceRequest.kt

@@ -238,11 +238,7 @@ fun EvidenceRequestCreatePassphraseView(
     var verifiedPassphrase by remember { mutableStateOf("") }
     var showMatchErrorText by remember { mutableStateOf(false) }
 
-    val constraints = PassphraseConstraints(
-        minLength = evidenceRequest.passphraseMinLength,
-        maxLength = evidenceRequest.passphraseMaxLength,
-        requireNumerical = evidenceRequest.passphraseRequireNumerical,
-    )
+    val constraints = evidenceRequest.passphraseConstraints
 
     Row(
         modifier = Modifier.fillMaxWidth(),