Add support for Digital Credentials on iOS

.gitignore

@@ -17,4 +17,6 @@ iosApp/iosApp.xcodeproj/*
 !iosApp/iosApp.xcodeproj/xcshareddata
 !iosApp/iosApp.xcodeproj/project.pbxproj
 shared/shared.podspec
+## User settings
+xcuserdata/
 metrics/

CHANGELOG.md

@@ -1,7 +1,16 @@
 # Release 5.7.6 (unreleased)
+ * Update to VC-K 5.11.0
  * Credentials: Fix displaying age verification credential
  * Support URL scheme `av` for age verification
-
+ * Use vck serializers for DC API
+ * DC API:
+   * Support requests with multiple protocols
+   * Use vck data classes to (de-)serialize received/emitted data
+   * Add preliminary support for iOS using ISO/IEC 18013-7 protocol. Known issues:
+     * iOS-specific pre-request is shown in a separate rather rudimentary UI
+     * Content in the pre-request is not yet compared with the content in the full request
+     * Sharing UI does not always open after approving the pre-request
+
 # Release 5.7.5
  * Update to VC-K 5.10.1
  * Provide self-signed key attestation on issuing

androidApp/build.gradle.kts

@@ -8,6 +8,7 @@ plugins {
 
 
 kotlin {
+    jvmToolchain(17)
     androidTarget()
     sourceSets {
         androidMain.dependencies {

androidApp/src/androidMain/kotlin/at/asitplus/wallet/app/android/AbstractWalletActivity.kt

@@ -60,16 +60,18 @@ abstract class AbstractWalletActivity : AppCompatActivity() {
                 )
             }
         } else {
+            Napier.e("Creating error response for DC API. Error: $resultStr")
             sendErrorResponse(resultStr, resultData)
         }
 
+        Napier.d("Successfully returned response to DC API invoker. Response: $resultStr")
         setResult(RESULT_OK, resultData)
         finish()
     }
 
     private fun sendErrorResponse(resultStr: String, resultData: Intent) {
         /* TODO check with SP that supports exceptions whether this works
-              * otherwise try with the Google GMS library (see above)
+              * otherwise try with the Google GMS library
             */
         Napier.v("Returning error response: $resultStr")
         PendingIntentHandler.setGetCredentialException(

androidApp/src/androidMain/kotlin/at/asitplus/wallet/app/android/MainActivity.kt

@@ -7,10 +7,11 @@ import android.os.Bundle
 import androidx.activity.compose.setContent
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.credentials.registry.provider.RegistryManager
-import at.asitplus.wallet.app.android.dcapi.DCAPIInvocationData
+import at.asitplus.wallet.app.android.dcapi.AndroidDCAPIInvocationData
 import at.asitplus.wallet.app.common.BuildContext
 import at.asitplus.wallet.app.common.BuildType
 import org.multipaz.prompt.AndroidPromptModel
+import org.multipaz.prompt.PromptModel
 import ui.navigation.PRESENTATION_REQUESTED_INTENT
 
 
@@ -19,7 +20,11 @@ class MainActivity : AbstractWalletActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         installSplashScreen()
         super.onCreate(savedInstanceState)
-        val promptModel = AndroidPromptModel()
+
+        val promptModel: PromptModel by lazy {
+            AndroidPromptModel.Builder().apply { addCommonDialogs() }.build()
+        }
+
         setContent {
             MainView(
                 buildContext = BuildContext(
@@ -38,7 +43,7 @@ class MainActivity : AbstractWalletActivity() {
         when (intent.action) {
             RegistryManager.ACTION_GET_CREDENTIAL -> {
                 Globals.dcapiInvocationData.value =
-                    DCAPIInvocationData(intent, ::sendCredentialResponseToDCAPIInvoker)
+                    AndroidDCAPIInvocationData(intent, ::sendCredentialResponseToDCAPIInvoker)
                 Globals.appLink.value = intent.action
             }
             PRESENTATION_REQUESTED_INTENT -> {

build.gradle.kts

@@ -4,7 +4,7 @@ plugins {
     val testballoonVer =
         System.getenv("TESTBALLOON_VERSION_OVERRIDE")?.ifBlank { null } ?: libs.versions.testballoon.get()
 
-    id("at.asitplus.gradle.conventions") version "20251023"
+    id("at.asitplus.gradle.conventions") version "20251217"
     kotlin("multiplatform") version kotlinVer apply false
     kotlin("plugin.serialization") version kotlinVer apply false
     id("de.infix.testBalloon") version testballoonVer apply false

cinterop/DigitalCredentials-iphoneos.def

@@ -0,0 +1,14 @@
+# Adapted from https://github.com/openwallet-foundation/multipaz
+
+package = at.asitplus.wallet.app.ios
+language = Objective-C
+
+headers = DigitalCredentials/DigitalCredentials-Swift.h
+headerFilter = DigitalCredentials/*
+
+staticLibraries = libDigitalCredentials.a
+libraryPaths = ../cinterop/build/Release-iphoneos
+
+linkerOpts = -L/usr/lib/swift
+linkerOpts.ios_x64 = -platform_version ios 16.0 16.0 -L/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/iphoneos/
+linkerOpts.ios_arm64 = -platform_version ios 16.0 16.0 -L/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/iphoneos/

cinterop/DigitalCredentials-iphonesimulator.def

@@ -0,0 +1,14 @@
+# Adapted from https://github.com/openwallet-foundation/multipaz
+
+package = at.asitplus.wallet.app.ios
+language = Objective-C
+
+headers = DigitalCredentials/DigitalCredentials-Swift.h
+headerFilter = DigitalCredentials/*
+
+staticLibraries = libDigitalCredentials.a
+libraryPaths = ../cinterop/build/Release-iphonesimulator
+
+linkerOpts = -L/usr/lib/swift
+linkerOpts.ios_x64 = -platform_version ios-simulator 16.0 16.0 -L/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/iphonesimulator/
+linkerOpts.ios_arm64 = -platform_version ios-simulator 16.0 16.0 -L/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/iphonesimulator/