diff --git a/.gitignore b/.gitignore index aa724b7..b42c16a 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ .externalNativeBuild .cxx local.properties +/app/release/ diff --git a/app/build.gradle b/app/build.gradle index 738be0c..d197858 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -51,7 +51,7 @@ dependencies { implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.0")) - implementation 'androidx.core:core-ktx:1.9.0' + implementation 'androidx.core:core-ktx:1.10.1' implementation 'com.google.code.gson:gson:2.10.1' implementation 'com.google.iot.cbor:cbor:0.01.02' implementation 'org.bouncycastle:bcpkix-jdk15on:1.69' @@ -60,21 +60,21 @@ dependencies { // Compose implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1' - implementation 'androidx.activity:activity-compose:1.7.0' - implementation "androidx.compose.material3:material3:1.0.1" - implementation "androidx.compose.ui:ui:1.4.1" - implementation "androidx.compose.ui:ui-tooling-preview:1.4.1" - implementation 'androidx.activity:activity-compose:1.7.0' + implementation 'androidx.activity:activity-compose:1.7.1' + implementation "androidx.compose.material3:material3:1.1.0" + implementation "androidx.compose.ui:ui:1.4.3" + implementation "androidx.compose.ui:ui-tooling-preview:1.4.3" + implementation 'androidx.activity:activity-compose:1.7.1' implementation 'androidx.navigation:navigation-compose:2.5.3' // Credentials manager - implementation "androidx.credentials:credentials:1.2.0-alpha03" - implementation "androidx.credentials:credentials-play-services-auth:1.2.0-alpha03" + implementation "androidx.credentials:credentials:1.2.0-alpha04" + implementation "androidx.credentials:credentials-play-services-auth:1.2.0-alpha04" // Hilt - implementation "com.google.dagger:hilt-android:2.44" + implementation "com.google.dagger:hilt-android:2.46" implementation 'androidx.hilt:hilt-navigation-compose:1.0.0' - kapt "com.google.dagger:hilt-compiler:2.44" + kapt "com.google.dagger:hilt-compiler:2.46" } kapt { diff --git a/app/release/app-release.apk b/app/release/app-release.apk deleted file mode 100644 index de731d4..0000000 Binary files a/app/release/app-release.apk and /dev/null differ diff --git a/app/src/main/java/com/dashlane/dashlanepasskeydemo/LoginViewModel.kt b/app/src/main/java/com/dashlane/dashlanepasskeydemo/LoginViewModel.kt index 3c90610..35e73c2 100644 --- a/app/src/main/java/com/dashlane/dashlanepasskeydemo/LoginViewModel.kt +++ b/app/src/main/java/com/dashlane/dashlanepasskeydemo/LoginViewModel.kt @@ -81,8 +81,8 @@ class LoginViewModel @Inject constructor( val userId = UUID.randomUUID().toString() try { val response = credentialManager.createCredential( + activity, CreatePublicKeyCredentialRequest(accountRepository.getCreatePasskeyRequest(userId, email)), - activity ) val responseData = gson.fromJson( (response as CreatePublicKeyCredentialResponse).registrationResponseJson, @@ -138,7 +138,7 @@ class LoginViewModel @Inject constructor( option: GetPublicKeyCredentialOption ): GetPasskeyResponseData { val getCredRequest = GetCredentialRequest(listOf(option)) - val response = credentialManager.getCredential(getCredRequest, activity) + val response = credentialManager.getCredential(activity, getCredRequest) val cred = response.credential as PublicKeyCredential return gson.fromJson(cred.authenticationResponseJson, GetPasskeyResponseData::class.java) }