Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions MultipazCodelab/Holder/androidApp/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ dependencies {

implementation(libs.multipaz)
implementation(libs.multipaz.compose)
implementation(libs.multipaz.dcapi.credman)

implementation(libs.ktor.client.android)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package org.multipaz.samples.wallet.cmp

import org.koin.android.ext.android.inject
import org.koin.java.KoinJavaComponent.inject
import org.multipaz.compose.digitalcredentials.CredentialManagerPresentmentActivity
import org.multipaz.presentment.PresentmentSource
import utopiasample.composeapp.generated.resources.Res
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,14 @@ package org.multipaz.samples.wallet.cmp
import android.content.Context
import org.koin.android.ext.android.inject
import org.koin.java.KoinJavaComponent.inject
import org.multipaz.compose.mdoc.MdocNdefService
import org.multipaz.compose.prompt.PresentmentActivity
import org.multipaz.context.applicationContext
import org.multipaz.mdoc.nfc.MdocNdefService
import org.multipaz.mdoc.transport.MdocTransportOptions
import org.multipaz.presentment.PresentmentSource
import org.multipaz.samples.wallet.cmp.util.AppSettingsModel

class NdefService(
applicationContext: Context,
sendResponse: (ByteArray) -> Unit,
) : MdocNdefService(
applicationContext,
sendResponse,
) {
class NdefService : MdocNdefService() {
private val presentmentSource: PresentmentSource by inject(PresentmentSource::class.java)
private val settingsModel: AppSettingsModel by inject(AppSettingsModel::class.java)

Expand All @@ -30,7 +25,6 @@ class NdefService(
source = presentmentSource,
promptModel = PresentmentActivity.promptModel,
presentmentModel = PresentmentActivity.presentmentModel,
activityClass = PresentmentActivity::class.java,
sessionEncryptionCurve = settingsModel.presentmentSessionEncryptionCurve.value,
useNegotiatedHandover = settingsModel.presentmentUseNegotiatedHandover.value,
negotiatedHandoverPreferredOrder = settingsModel.presentmentNegotiatedHandoverPreferredOrder.value,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
package org.multipaz.samples.wallet.cmp

import kotlinx.io.bytestring.ByteString
import org.multipaz.compose.mdoc.CombinedNfcService
import org.multipaz.compose.mdoc.NfcApduService
import org.multipaz.mdoc.nfc.MdocNfcDataTransferService
import org.multipaz.nfc.Nfc
import org.multipaz.nfc.NfcApduRouter
import org.multipaz.nfc.NfcApduService

class UtopiaNfcService : CombinedNfcService() {
class UtopiaNfcService : NfcApduRouter() {
override fun buildServices(): Map<ByteString, NfcApduService> {
return mapOf(
Nfc.NDEF_APPLICATION_ID to NdefService(this, ::sendResponseApdu),
Nfc.NDEF_APPLICATION_ID to NdefService(),
Nfc.ISO_MDOC_NFC_DATA_TRANSFER_APPLICATION_ID to MdocNfcDataTransferService(),
)
}
}
3 changes: 2 additions & 1 deletion MultipazCodelab/Holder/composeApp/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ kotlin {
implementation(libs.androidx.appcompat)
implementation(libs.ktor.client.android)
implementation(libs.koin.android)
implementation(libs.multipaz.dcapi.credman)
}
commonMain.dependencies {
implementation(compose.runtime)
Expand All @@ -60,7 +61,6 @@ kotlin {
implementation(libs.kotlinx.datetime)
implementation(libs.multipaz)
implementation(libs.multipaz.doctypes)
implementation(libs.multipaz.dcapi)
implementation(libs.multipaz.compose)
implementation(libs.ktor.client.core)
// CIO for JVM/Android; Darwin engine for iOS in iosMain
Expand All @@ -76,6 +76,7 @@ kotlin {
implementation(libs.ktor.client.darwin)
implementation(libs.androidx.sqlite)
implementation(libs.androidx.sqlite.framework)
implementation(libs.multipaz.dcapi.ios)
}
}
commonTest.dependencies {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
package org.multipaz.samples.wallet.cmp.util

import org.multipaz.digitalcredentials.DigitalCredentials
import org.multipaz.digitalcredentials.DigitalCredentialsCredman

actual fun shouldRegisterDigitalCredentialsInCommonModule(): Boolean = true

actual suspend fun getDigitalCredentials(): DigitalCredentials {
return DigitalCredentialsCredman.create()
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import org.multipaz.cbor.buildCborArray
import org.multipaz.cbor.toDataItem
import org.multipaz.crypto.EcCurve
import org.multipaz.digitalcredentials.DigitalCredentials
import org.multipaz.digitalcredentials.getDefault
import org.multipaz.storage.Storage
import org.multipaz.storage.StorageTable
import org.multipaz.storage.StorageTableSpec
Expand Down Expand Up @@ -45,7 +44,7 @@ class AppSettingsModel private constructor(
): AppSettingsModel {
val instance = AppSettingsModel(readOnly)
instance.settingsTable = storage.getTable(tableSpec)
instance.digitalCredentials = DigitalCredentials.getDefault()
instance.digitalCredentials = getDigitalCredentials()
instance.init()
return instance
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package org.multipaz.samples.wallet.cmp.util
import kotlinx.coroutines.sync.Mutex
import kotlinx.coroutines.sync.withLock
import org.multipaz.digitalcredentials.DigitalCredentials
import org.multipaz.digitalcredentials.getDefault
import org.multipaz.document.DocumentStore
import org.multipaz.documenttype.DocumentTypeRepository
import org.multipaz.util.Logger
Expand All @@ -27,7 +26,7 @@ class DigitalCredentialsRegistrationManager(
}

registerMutex.withLock {
val digitalCredentials: DigitalCredentials = DigitalCredentials.getDefault()
val digitalCredentials: DigitalCredentials = getDigitalCredentials()
if (!digitalCredentials.registerAvailable) {
Logger.i(TAG, "Skipping register: API not available ($reason)")
return
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
package org.multipaz.samples.wallet.cmp.util

import org.multipaz.digitalcredentials.DigitalCredentials

expect fun shouldRegisterDigitalCredentialsInCommonModule(): Boolean

expect suspend fun getDigitalCredentials(): DigitalCredentials
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
package org.multipaz.samples.wallet.cmp.util

import org.multipaz.digitalcredentials.DigitalCredentials
import org.multipaz.digitalcredentials.DigitalCredentialsIos

actual fun shouldRegisterDigitalCredentialsInCommonModule(): Boolean = false

actual suspend fun getDigitalCredentials(): DigitalCredentials {
return DigitalCredentialsIos.create()
}
5 changes: 3 additions & 2 deletions MultipazCodelab/Holder/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ kotlinx-coroutines = "1.8.1"
kotlinx-io = "0.4.0"
kotlinx-datetime = "0.6.0"
kotlinx-serialization = "1.7.3"
multipaz = "0.101.0"
multipaz = "0.102.0"
ktor = "3.1.0"
androidx-sqlite = "2.5.2"
coil = "3.3.0"
Expand Down Expand Up @@ -48,7 +48,8 @@ kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serializa
multipaz = { group = "org.multipaz", name = "multipaz", version.ref = "multipaz" }
multipaz-doctypes = { group = "org.multipaz", name = "multipaz-doctypes", version.ref = "multipaz" }
multipaz-compose = { group = "org.multipaz", name = "multipaz-compose", version.ref = "multipaz" }
multipaz-dcapi = { group = "org.multipaz", name = "multipaz-dcapi", version.ref = "multipaz" }
multipaz-dcapi-credman = { group = "org.multipaz", name = "multipaz-dcapi-credman", version.ref = "multipaz" }
multipaz-dcapi-ios = { group = "org.multipaz", name = "multipaz-dcapi-ios", version.ref = "multipaz" }
ktor-client-core = { module = "io.ktor:ktor-client-core", version.ref = "ktor" }
ktor-client-java = { module = "io.ktor:ktor-client-java", version.ref = "ktor" }
ktor-client-cio = { module = "io.ktor:ktor-client-cio", version.ref = "ktor" }
Expand Down
Loading