chore: prepare for 0.13.1 release

nklomp · nklomp · commit f80ac59ef476 · 2026-01-13T03:39:08.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,17 @@
 # Changelog
 
-## 0.13.1-SNAPSHOT — 20260108
 
-- Based on Kiwa SDK 0.13.1-SNAPSHOT and Identity Development Kit 0.13.1-SNAPSHOT
-- Version bump to 0.13.1-SNAPSHOT of the Kiwa SDK to align with IDK 0.13.1-SNAPSHOT
+## 0.13.1 — 20260113
+
+- Based on Kiwa SDK 0.13.1 and Identity Development Kit 0.13.1
+- Version bump to 0.13.1 of the Kiwa SDK to align with IDK 0.13.1
+- Improvements on NFC engagement handling
+
+
+## 0.13.0 — 20260108
+
+- Based on Kiwa SDK 0.13.0 and Identity Development Kit 0.13.0
+- Version bump to 0.13.0 of the Kiwa SDK to align with IDK 0.13.0
 - minSdk to 30, because of external library dependencies
 - Add sample Swift app, next to the ios and Android compose app
 - XCFramework building added
@@ -12,7 +20,7 @@
 
 ### Breaking Changes
 
-#### IdkResult API Overhaul (from IDK 0.13.1-SNAPSHOT)
+#### IdkResult API Overhaul (from IDK 0.13.0)
 The `IdkResult` type has been completely redesigned for better iOS/Swift/ObjC interoperability:
 - **Changed from typealias to wrapper class**: `IdkResult` is now a proper class wrapping kotlin-result's `Result`, instead of a simple typealias
 - **New `Ok` and `Err` subclasses**: Use `Ok(value)` and `Err(error)` constructors instead of kotlin-result's functions directly
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -20,7 +20,7 @@
 
 allprojects {
     group = "com.sphereon.kiwa.sample"
-    version = "0.13.1-SNAPSHOT"
+    version = "0.13.1"
 
     plugins.withType<MavenPublishPlugin> {
         configure<PublishingExtension> {
diff --git a/example/holder/compose-sample-app/composeApp/build.gradle.kts b/example/holder/compose-sample-app/composeApp/build.gradle.kts
@@ -148,10 +148,11 @@ kotlin {
             implementation(sphereonlib.org.jetbrains.kotlinx.coroutines.core)
             // Kiwa SDK interfaces and common code
             api(libs.kiwa.holder.sdk.public)
-            api(libs.sphereon.mdoc.core.public)
             api(libs.sphereon.mdoc.core.impl)
             api(libs.sphereon.mdoc.datatransfer.public)
-
+            api(libs.sphereon.oauth2.common.impl)
+            api(libs.sphereon.oauth2.client.impl)
+            api(libs.sphereon.openid.oid4vp.holder.impl)
 
             api(libs.amz.app.platform.presenter.molecule.public)
             api(libs.amz.app.platform.renderer.compose.public)
diff --git a/example/holder/compose-sample-app/composeApp/src/androidMain/kotlin/com/sphereon/kiwa/sample/app/MdocNfcService.kt b/example/holder/compose-sample-app/composeApp/src/androidMain/kotlin/com/sphereon/kiwa/sample/app/MdocNfcService.kt
@@ -56,7 +56,6 @@ class MdocNfcService : AbstractMdocNfcService() {
 
 
     companion object {
-
         lateinit var app: KiwaSampleApplication
 
         /**
diff --git a/example/holder/ui/core/impl/src/commonMain/kotlin/com/sphereon/kiwa/sample/ui/core/logs/LogViewerRenderer.kt b/example/holder/ui/core/impl/src/commonMain/kotlin/com/sphereon/kiwa/sample/ui/core/logs/LogViewerRenderer.kt
@@ -208,7 +208,7 @@ class LogViewerRenderer : ComposeRenderer<LogViewerPresenter.Model>() {
     private fun ExportFeedbackTip() {
         Spacer(modifier = Modifier.height(8.dp))
         Text(
-            text = "💡 Tip: Open any text editor app, paste (Ctrl+V), and save the file.",
+            text = "Tip: Open any text editor app, paste (Ctrl+V), and save the file.",
             color = AppColors.Screen.foreground.copy(alpha = 0.8f),
             fontSize = 10.sp,
             fontStyle = FontStyle.Italic
diff --git a/example/holder/ui/elicense/impl/src/commonMain/kotlin/com/sphereon/kiwa/sample/ui/elicense/engagement/qr/MdocEngagementPresenterImpl.kt b/example/holder/ui/elicense/impl/src/commonMain/kotlin/com/sphereon/kiwa/sample/ui/elicense/engagement/qr/MdocEngagementPresenterImpl.kt
@@ -36,6 +36,7 @@ import com.sphereon.mdoc.data.device.DeviceRequest
 import com.sphereon.mdoc.engagement.MdocEngagementManager
 import com.sphereon.mdoc.engagement.QrMode
 import com.sphereon.mdoc.engagement.TerminalOutcome
+import com.sphereon.mdoc.engagement.MdocEngagementState
 import com.sphereon.mdoc.engagement.UiPhase
 import com.sphereon.mdoc.transfer.MapDrivenDocRequestSelector
 import com.sphereon.mdoc.transfer.TransferManager
@@ -80,6 +81,10 @@ class MdocEngagementPresenterImpl(
         // State storage for session and engagement
         var sessionState by remember { mutableStateOf(engagementManager.eventHub.sessionState.value) }
         var activeEngagement by remember { mutableStateOf(engagementManager.activeEngagement.value) }
+        var nfcEngagement by remember { mutableStateOf(engagementManager.nfcEngagement.value) }
+
+        // NFC timeout error state
+        var nfcTimeoutError by remember { mutableStateOf(false) }
 
         // Collect session state from the engagement manager
         // StateFlow already guarantees distinct values by design
@@ -99,6 +104,57 @@ class MdocEngagementPresenterImpl(
                 }
         }
 
+        // Collect NFC engagement separately
+        LaunchedEffect(engagementManager) {
+            engagementManager.nfcEngagement
+                .collect { eng ->
+                    nfcEngagement = eng
+                    // Reset timeout error when NFC engagement changes
+                    if (eng != null) {
+                        nfcTimeoutError = false
+                    }
+                }
+        }
+
+        // NFC-specific timeout: 3 seconds for reader to establish BLE connection
+        // Only applies when we have an NFC engagement in ENGAGEMENT phase (waiting for BLE)
+        // Also applies when a NEW NFC engagement comes in while still in TERMINAL phase from previous timeout
+        val isNewNfcEngagementInTerminal = nfcEngagement?.let { eng ->
+            sessionState.phase == UiPhase.TERMINAL && eng.getCurrentState().order <= MdocEngagementState.START.order
+        } == true
+        val isNfcWaitingForConnection = nfcEngagement != null &&
+            (sessionState.phase == UiPhase.ENGAGEMENT || isNewNfcEngagementInTerminal) &&
+            !nfcTimeoutError
+
+        LaunchedEffect(isNfcWaitingForConnection, nfcEngagement?.id) {
+            if (isNfcWaitingForConnection && nfcEngagement != null) {
+                log.info("NFC engagement detected - starting 3 second connection timeout")
+                kotlinx.coroutines.delay(NFC_CONNECTION_TIMEOUT_MS)
+
+                // Check if connection hasn't been established yet
+                // This can be either:
+                // 1. Phase is still ENGAGEMENT (normal case)
+                // 2. Phase is still TERMINAL and engagement state is still early (new tap after previous timeout)
+                val currentPhase = engagementManager.eventHub.sessionState.value.phase
+                val currentNfcEngagement = engagementManager.nfcEngagement.value
+                val isStillWaiting = currentNfcEngagement?.id == nfcEngagement?.id && when {
+                    currentPhase == UiPhase.ENGAGEMENT -> true
+                    currentPhase == UiPhase.TERMINAL -> {
+                        // Check if engagement state is still early (hasn't progressed to transfer)
+                        currentNfcEngagement?.getCurrentState()?.order?.let { it <= MdocEngagementState.START.order } == true
+                    }
+                    else -> false // TRANSFER phase means connection was established
+                }
+
+                if (isStillWaiting) {
+                    log.warn("NFC connection timeout - tap was too short")
+                    nfcTimeoutError = true
+                    // Close the engagement
+                    engagementManager.closeAll()
+                }
+            }
+        }
+
         // Log the current values on every recomposition for debugging
         log.debug("!!! RECOMPOSITION - sessionState: phase=${sessionState.phase}, qrMode=${sessionState.qrMode}, activeEngagement: ${activeEngagement?.id}")
 
@@ -223,7 +279,7 @@ class MdocEngagementPresenterImpl(
 
         // Handle QR code scanned for reverse engagement (no remember - same pattern as CredentialListPresenterImpl)
         val onQrScanned: (String) -> Unit = { scannedData ->
-                log.info("📷 QR SCANNED! Length: ${scannedData.length}, First 30 chars: '${scannedData.take(30)}'")
+                log.info("QR SCANNED! Length: ${scannedData.length}, First 30 chars: '${scannedData.take(30)}'")
                 log.debug("Full scanned data: $scannedData")
                 when {
                     // 18013-7 website via deeplink/QR
@@ -299,7 +355,7 @@ class MdocEngagementPresenterImpl(
                     }
 
                     else -> {
-                        log.warn("⚠️ Invalid QR code: Expected 'mdoc://', 'mdoc:', or 'mdoc-openid4vp://' - got prefix: ${scannedData.take(20)}")
+                        log.warn("Invalid QR code: Expected 'mdoc://', 'mdoc:', or 'mdoc-openid4vp://' - got prefix: ${scannedData.take(20)}")
                     }
                 }
         }
@@ -363,6 +419,16 @@ class MdocEngagementPresenterImpl(
         // Special case: If TERMINAL state but no active engagement AND we never had an engagement,
         // this is stale state from a previous session - treat as INITIAL with toggle UI
         val model = when {
+            // NFC timeout error takes precedence - show error screen
+            nfcTimeoutError -> {
+                log.debug(">>> Returning Model: ERROR (NFC tap too short)")
+                MdocEngagementPresenter.Model.Error(
+                    errorType = MdocEngagementPresenter.ErrorType.NFC_TAP_TOO_SHORT,
+                    errorMessage = "NFC tap was too short. Please hold your phone to the reader a bit longer.",
+                    onStateEvent = onEvent
+                )
+            }
+
             sessionState.phase == UiPhase.TERMINAL && activeEngagement == null && !hasHadEngagement.value -> {
                 log.debug(">>> Stale TERMINAL state detected (never had engagement in this session) - returning Engagement with toggle")
                 MdocEngagementPresenter.Model.Engagement(
@@ -375,6 +441,22 @@ class MdocEngagementPresenterImpl(
                 )
             }
 
+            // New NFC engagement came in but session state hasn't caught up yet (still TERMINAL from previous)
+            // This happens when a new NFC tap occurs right after a timeout - treat as new engagement
+            sessionState.phase == UiPhase.TERMINAL && nfcEngagement?.let { eng ->
+                eng.getCurrentState().order <= MdocEngagementState.START.order
+            } == true -> {
+                log.debug(">>> New NFC engagement detected while still in TERMINAL phase - returning Engagement")
+                MdocEngagementPresenter.Model.Engagement(
+                    qrImage = null,
+                    engagementEvent = null,
+                    showQr = false,
+                    showQrScanner = false,
+                    onQrScanned = onQrScanned,
+                    onStateEvent = onEvent
+                )
+            }
+
             // If phase is ENGAGEMENT but there's no active engagement, it's stale state - treat as ready for engagement
             sessionState.phase == UiPhase.ENGAGEMENT && activeEngagement == null -> {
                 log.debug(">>> Stale ENGAGEMENT state detected (no active engagement) - returning Engagement with toggle")
@@ -505,5 +587,7 @@ class MdocEngagementPresenterImpl(
 
     private companion object {
         const val MIN_DOC_REQUESTS = 1
+        /** NFC connection timeout in milliseconds - short timeout since NFC handover is quick */
+        const val NFC_CONNECTION_TIMEOUT_MS = 3000L
     }
 }
diff --git a/example/holder/ui/elicense/impl/src/commonMain/kotlin/com/sphereon/kiwa/sample/ui/elicense/engagement/qr/MdocEngagementRenderer.kt b/example/holder/ui/elicense/impl/src/commonMain/kotlin/com/sphereon/kiwa/sample/ui/elicense/engagement/qr/MdocEngagementRenderer.kt
@@ -42,6 +42,7 @@ import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.CheckCircle
+import androidx.compose.material.icons.filled.Error
 import androidx.compose.material.icons.outlined.Nfc
 import androidx.compose.material3.Button
 import androidx.compose.material3.ButtonDefaults
@@ -115,6 +116,7 @@ class MdocEngagementRenderer(
                     is MdocEngagementPresenter.Model.Selecting -> RenderSelecting(model, fg)
                     is MdocEngagementPresenter.Model.Sharing -> RenderSharing(model, fg)
                     is MdocEngagementPresenter.Model.Success -> RenderSuccess(model)
+                    is MdocEngagementPresenter.Model.Error -> RenderError(model, fg)
                     is MdocEngagementPresenter.Model.Stopped -> Spacer(modifier = Modifier.height(1.dp))
                 }
             }
@@ -368,6 +370,68 @@ class MdocEngagementRenderer(
         }
     }
 
+    @Composable
+    private fun RenderError(model: MdocEngagementPresenter.Model.Error, fg: Color) {
+        Column(modifier = Modifier.fillMaxSize()) {
+            // Auto-navigate back after delay
+            LaunchedEffect(Unit) {
+                delay(DELAY_ERROR_MS)
+                model.onStateEvent(MdocEngagementPresenter.UiStateEvent.Stopped)
+            }
+            Box(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .weight(1f, fill = true),
+                contentAlignment = Alignment.Center
+            ) {
+                Card(
+                    colors = CardDefaults.cardColors(containerColor = Color(COLOR_CARD_BG)),
+                    modifier = Modifier.padding(SPACING_STANDARD.dp)
+                ) {
+                    Column(
+                        modifier = Modifier
+                            .padding(PADDING_CARD.dp)
+                            .fillMaxWidth(),
+                        horizontalAlignment = Alignment.CenterHorizontally
+                    ) {
+                        Icon(
+                            imageVector = Icons.Filled.Error,
+                            contentDescription = "Error",
+                            tint = Color(COLOR_ERROR),
+                            modifier = Modifier.size(ICON_SIZE_SUCCESS.dp)
+                        )
+                        Spacer(Modifier.height(SPACING_STANDARD.dp))
+                        Text(
+                            text = when (model.errorType) {
+                                MdocEngagementPresenter.ErrorType.NFC_TAP_TOO_SHORT -> "NFC Tap Too Short"
+                                MdocEngagementPresenter.ErrorType.GENERAL -> "Error"
+                            },
+                            color = fg,
+                            fontWeight = FontWeight.Bold,
+                            fontSize = FONT_SIZE_TITLE.sp
+                        )
+                        Spacer(Modifier.height(SPACING_TINY.dp))
+                        Text(
+                            text = model.errorMessage,
+                            color = fg.copy(alpha = ALPHA_HIGH),
+                            fontSize = FONT_SIZE_BODY.sp,
+                            textAlign = TextAlign.Center
+                        )
+                    }
+                }
+            }
+            Spacer(modifier = Modifier.height(SPACING_STANDARD.dp))
+            Button(
+                onClick = { model.onStateEvent(MdocEngagementPresenter.UiStateEvent.Stopped) },
+                colors = ButtonDefaults.buttonColors(
+                    containerColor = fg.copy(alpha = BUTTON_ALPHA_LOW),
+                    contentColor = fg
+                ),
+                modifier = Modifier.fillMaxWidth().height(BUTTON_HEIGHT.dp)
+            ) { Text("Close") }
+        }
+    }
+
     @Composable
     @Suppress("UnusedParameter") // model parameter required by interface but not used in this implementation
     private fun RenderSharing(model: MdocEngagementPresenter.Model.Sharing, fg: Color) {
@@ -408,13 +472,13 @@ class MdocEngagementRenderer(
             // Use ScannerWithPermissions and debounce scan events
             ScannerWithPermissions(
                 onScanned = { result: String ->
-                    println("🔍 Scanner detected QR: '${result.take(50)}...' (length: ${result.length})")
+                    println("Scanner detected QR: '${result.take(50)}...' (length: ${result.length})")
                     if (!hasScanned && result.isNotBlank()) {
-                        println("✓ Passing to callback...")
+                        println("Passing to callback...")
                         hasScanned = true
                         onQrScanned(result)
                     } else {
-                        println("✗ Rejected (hasScanned=$hasScanned, isBlank=${result.isBlank()})")
+                        println("Rejected (hasScanned=$hasScanned, isBlank=${result.isBlank()})")
                     }
                     true // Return true to stop scanning
                 },
@@ -679,6 +743,7 @@ private const val COLOR_PURPLE = 0xFF7C40E8
 private const val COLOR_PURPLE_LIGHT = 0xFF7276F7
 private const val COLOR_ACCENT_BLUE = 0xFF0B81FF
 private const val COLOR_SUCCESS = 0xFF31C26E
+private const val COLOR_ERROR = 0xFFE84040
 private const val COLOR_CARD_BG = 0xFF2F364C
 private const val COLOR_BORDER_GRAY = 0xFF5D6990
 private const val PADDING_HORIZONTAL = 16
@@ -703,6 +768,7 @@ private const val ICON_SIZE_SUCCESS = 64
 private const val FONT_SIZE_TITLE = 24
 private const val FONT_SIZE_BODY = 16
 private const val DELAY_SUCCESS_MS = 1500L
+private const val DELAY_ERROR_MS = 3000L
 private const val SELECTION_PROMPT_HEIGHT = 80
 private const val CORNER_RADIUS = 6
 private const val MINI_CARD_WIDTH = 83
diff --git a/example/holder/ui/elicense/public/src/commonMain/kotlin/com/sphereon/kiwa/sample/ui/elicense/engagement/qr/MdocEngagementPresenter.kt b/example/holder/ui/elicense/public/src/commonMain/kotlin/com/sphereon/kiwa/sample/ui/elicense/engagement/qr/MdocEngagementPresenter.kt
@@ -98,6 +98,26 @@ interface MdocEngagementPresenter : MoleculePresenter<Unit, MdocEngagementPresen
 
         @Immutable
         data class Success(override val onStateEvent: (event: UiStateEvent) -> Unit) : Model
+
+        /**
+         * Error state displayed when engagement fails (e.g., NFC tap too short).
+         */
+        @Immutable
+        data class Error(
+            val errorType: ErrorType,
+            val errorMessage: String,
+            override val onStateEvent: (event: UiStateEvent) -> Unit
+        ) : Model
+    }
+
+    /**
+     * Types of errors that can occur during engagement.
+     */
+    enum class ErrorType {
+        /** NFC tap was too short - reader couldn't complete handover */
+        NFC_TAP_TOO_SHORT,
+        /** General engagement error */
+        GENERAL
     }
 
     sealed interface UiStateEvent {
diff --git a/example/holder/xcframework/COCOAPODS.md b/example/holder/xcframework/COCOAPODS.md
@@ -59,7 +59,7 @@ pod 'KiwaSdk', :podspec => '/path/to/kiwa-sample/example/holder/xcframework/buil
 
 # Option C: Use a private spec repo
 source 'https://github.com/your-org/private-podspecs.git'
-pod 'KiwaSdk', '~> 0.13.1-SNAPSHOT'
+pod 'KiwaSdk', '~> 0.13.1'
 ```
 
 ### 3. Install Dependencies
@@ -78,9 +78,9 @@ If you prefer to integrate the XCFramework directly without CocoaPods:
 ```bash
 # For snapshots
 curl -u "$KIWA_REPO_USER:$KIWA_REPO_PASSWORD" \
-  -O "https://nexus.sphereon.com/repository/kiwa-snapshots/com/sphereon/kiwa/kiwa-sdk-ios/0.13.1-SNAPSHOT/kiwa-sdk-ios-0.13.1-SNAPSHOT.zip"
+  -O "https://nexus.sphereon.com/repository/kiwa-snapshots/com/sphereon/kiwa/kiwa-sdk-ios/0.13.1/kiwa-sdk-ios-0.13.1.zip"
 
-unzip kiwa-sdk-ios-0.13.1-SNAPSHOT.zip
+unzip kiwa-sdk-ios-0.13.1.zip
 ```
 
 ### 2. Add to Xcode Project
diff --git a/example/holder/xcframework/gradle.properties b/example/holder/xcframework/gradle.properties
@@ -36,7 +36,7 @@ kotlin.mpp.androidSourceSetLayoutVersion=2
 android.useAndroidX=true
 android.nonTransitiveRClass=true
 ksp.useKSP2=false
-version=0.13.1-SNAPSHOT
+version=0.13.1
 kotlin.native.enableKlibsCrossCompilation=false
 org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
 org.jetbrains.dokka.experimental.gradle.pluginMode.noWarn=true
diff --git a/gradle.properties b/gradle.properties
@@ -37,7 +37,7 @@ kotlin.mpp.androidSourceSetLayoutVersion=2
 android.useAndroidX=true
 android.nonTransitiveRClass=true
 ksp.useKSP2=false
-version=0.13.1-SNAPSHOT
+version=0.13.1
 kotlin.native.enableKlibsCrossCompilation=false
 org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
 org.jetbrains.dokka.experimental.gradle.pluginMode.noWarn=true
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
