Skip to content

Migrate Multipaz codelab to v0.98.0 #92

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hanluOMH merged 1 commit into from
Apr 14, 2026
Merged

Migrate Multipaz codelab to v0.98.0 #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion ...lder/composeApp/src/androidMain/kotlin/org/multipaz/samples/wallet/cmp/CredmanActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package org.multipaz.samples.wallet.cmp

import org.koin.android.ext.android.inject
import org.multipaz.compose.digitalcredentials.CredentialManagerPresentmentActivity
import org.multipaz.presentment.model.PresentmentSource
import org.multipaz.presentment.PresentmentSource
import utopiasample.composeapp.generated.resources.Res

class CredmanActivity : CredentialManagerPresentmentActivity() {
Expand Down
5 changes: 2 additions & 3 deletions ...b/Holder/composeApp/src/androidMain/kotlin/org/multipaz/samples/wallet/cmp/NdefService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import org.koin.android.ext.android.inject
import org.multipaz.compose.mdoc.MdocNdefService
import org.multipaz.compose.prompt.PresentmentActivity
import org.multipaz.mdoc.transport.MdocTransportOptions
import org.multipaz.presentment.model.PresentmentSource
import org.multipaz.presentment.PresentmentSource
import org.multipaz.samples.wallet.cmp.util.AppSettingsModel

class NdefService : MdocNdefService() {
Expand All @@ -14,8 +14,7 @@ class NdefService : MdocNdefService() {
override suspend fun getSettings(): Settings {
// Reset the presentment model with the source's document store and repository
PresentmentActivity.presentmentModel.reset(
documentStore = presentmentSource.documentStore,
documentTypeRepository = presentmentSource.documentTypeRepository,
source = presentmentSource,
preselectedDocuments = emptyList(),
)

Expand Down
13 changes: 6 additions & 7 deletions ...der/composeApp/src/commonMain/kotlin/org/multipaz/samples/wallet/cmp/di/MultipazModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ import org.multipaz.document.buildDocumentStore
import org.multipaz.documenttype.DocumentTypeRepository
import org.multipaz.documenttype.knowntypes.DrivingLicense
import org.multipaz.documenttype.knowntypes.Loyalty
import org.multipaz.presentment.model.PresentmentModel
import org.multipaz.presentment.model.PresentmentSource
import org.multipaz.presentment.model.SimplePresentmentSource
import org.multipaz.presentment.PresentmentModel
import org.multipaz.presentment.PresentmentSource
import org.multipaz.presentment.SimplePresentmentSource
import org.multipaz.prompt.PromptModel
import org.multipaz.prompt.promptModelRequestConsent
import org.multipaz.prompt.promptModelSilentConsent
Expand All @@ -35,10 +35,9 @@ import org.multipaz.samples.wallet.cmp.util.shouldRegisterDigitalCredentialsInCo
import org.multipaz.securearea.SecureArea
import org.multipaz.securearea.SecureAreaRepository
import org.multipaz.storage.Storage
import org.multipaz.trustmanagement.TrustEntryAlreadyExistsException
import org.multipaz.trustmanagement.TrustManager
import org.multipaz.trustmanagement.TrustManagerLocal
import org.multipaz.trustmanagement.TrustMetadata
import org.multipaz.trustmanagement.TrustPointAlreadyExistsException
import org.multipaz.util.Logger
import org.multipaz.util.Platform
import utopiasample.composeapp.generated.resources.Res
Expand Down Expand Up @@ -96,7 +95,7 @@ val multipazModule =
}

single<TrustManager> {
val trustManager = TrustManagerLocal(storage = get(), identifier = "reader")
val trustManager = TrustManager(storage = get(), identifier = "reader")

runBlocking {
suspend fun addCertificateIfNotExists(
Expand All @@ -121,7 +120,7 @@ val multipazModule =
),
)
Logger.i("TrustManager", "Successfully added certificate: $displayName")
} catch (e: TrustPointAlreadyExistsException) {
} catch (e: TrustEntryAlreadyExistsException) {
Logger.e(
"TrustManager",
"Certificate already exists: $displayName",
Expand Down
2 changes: 1 addition & 1 deletion ...lder/composeApp/src/commonMain/kotlin/org/multipaz/samples/wallet/cmp/ui/AccountScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ import org.multipaz.mdoc.connectionmethod.MdocConnectionMethod
import org.multipaz.mdoc.connectionmethod.MdocConnectionMethodBle
import org.multipaz.mdoc.connectionmethod.MdocConnectionMethodNfc
import org.multipaz.mdoc.transport.MdocTransportOptions
import org.multipaz.presentment.model.PresentmentSource
import org.multipaz.presentment.PresentmentSource
import org.multipaz.prompt.PromptModel
import org.multipaz.samples.wallet.cmp.util.AppSettingsModel
import org.multipaz.util.Logger
Expand Down
4 changes: 2 additions & 2 deletions MultipazCodelab/Holder/gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[versions]
agp = "8.7.3"
android-compileSdk = "35"
android-minSdk = "26"
android-minSdk = "29"
android-targetSdk = "35"
androidx-activity = "1.10.1"
androidx-appcompat = "1.7.1"
Expand All @@ -18,7 +18,7 @@ kotlinx-io = "0.4.0"
kotlinx-datetime = "0.6.0"
kotlinx-serialization = "1.7.3"
# Align Multipaz with Kotlin 2.2.0 (same as identity-credential root)
multipaz = "0.97.0"
multipaz = "0.98.0"
ktor = "3.1.0"
androidx-sqlite = "2.5.2"
coil = "3.3.0"
Expand Down
Loading