version catalog added; onBackPressed() replaced.

CredentialProvider/MyVault/app/build.gradle.kts

@@ -15,27 +15,26 @@
  */
 plugins {
     alias(libs.plugins.android.application)
-    alias(libs.plugins.jetbrains.kotlin.android)
+    alias(libs.plugins.kotlin.compose.compiler)
+    alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.androidx.navigation.safeargs)
+    alias(libs.plugins.androidx.room)
     alias(libs.plugins.devtools.ksp)
 }
 
 android {
     namespace = "com.example.android.authentication.myvault"
-
-    compileSdkPreview = "VanillaIceCream"
-
+    compileSdk = 35
     defaultConfig {
         applicationId = "com.example.android.authentication.myvault"
         minSdk = 34
-        targetSdkPreview = "VanillaIceCream"
+        targetSdk = 35
         versionCode = 1
         versionName = "1.0"
-
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
             useSupportLibrary = true
         }
-
     }
 
     buildTypes {
@@ -48,49 +47,48 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "17"
     }
     buildFeatures {
         compose = true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion = "1.5.10"
-    }
     packaging {
         resources {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"
         }
     }
+    room {
+        schemaDirectory("${rootDir}/schema")
+    }
 }
 
 dependencies {
-
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.lifecycle.runtime.ktx)
     implementation(libs.androidx.activity.compose)
     implementation(platform(libs.androidx.compose.bom))
-    implementation(libs.androidx.ui)
-    implementation(libs.androidx.ui.graphics)
-    implementation(libs.androidx.ui.tooling.preview)
-    implementation(libs.androidx.material3)
-    implementation(libs.androidx.credential.manager)
+    implementation(libs.androidx.compose.ui)
+    implementation(libs.androidx.compose.ui.graphics)
+    implementation(libs.androidx.compose.ui.tooling.preview)
+    implementation(libs.androidx.compose.material3)
+    implementation(libs.androidx.credentials)
     implementation(libs.androidx.room.ktx)
     implementation(libs.androidx.room.runtime)
     ksp(libs.androidx.room.compiler)
     annotationProcessor(libs.androidx.room.compiler)
     implementation(libs.androidx.biometrics)
     implementation(libs.androidx.navigation)
     implementation(libs.google.accompanist)
-    implementation(libs.androidx.lifecyle.runtime.compose)
+    implementation(libs.androidx.lifecycle.runtime.compose)
     testImplementation(libs.junit)
-    androidTestImplementation(libs.androidx.junit)
-    androidTestImplementation(libs.androidx.espresso.core)
+    androidTestImplementation(libs.androidx.test.ext.junit)
+    androidTestImplementation(libs.androidx.test.espresso.core)
     androidTestImplementation(platform(libs.androidx.compose.bom))
-    androidTestImplementation(libs.androidx.ui.test.junit4)
-    debugImplementation(libs.androidx.ui.tooling)
-    debugImplementation(libs.androidx.ui.test.manifest)
+    androidTestImplementation(libs.androidx.compose.ui.test.junit4)
+    debugImplementation(libs.androidx.compose.ui.tooling)
+    debugImplementation(libs.androidx.compose.ui.test.manifest)
 }

CredentialProvider/MyVault/app/src/main/AndroidManifest.xml

@@ -14,22 +14,23 @@
  * limitations under the License.
 -->
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tools="http://schemas.android.com/tools">
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
+
     <application
-            android:name="com.example.android.authentication.myvault.MyVaultApplication"
-            android:icon="@drawable/android_secure"
-            android:label="@string/app_name"
-            android:roundIcon="@drawable/android_secure"
-            android:supportsRtl="true"
-            tools:ignore="LockedOrientationActivity"
-            android:theme="@style/Theme.MyVault">
+        android:name="com.example.android.authentication.myvault.MyVaultApplication"
+        android:icon="@drawable/android_secure"
+        android:label="@string/app_name"
+        android:roundIcon="@drawable/android_secure"
+        android:supportsRtl="true"
+        tools:ignore="LockedOrientationActivity"
+        android:theme="@style/Theme.MyVault">
         <activity
-                android:name="com.example.android.authentication.myvault.ui.MainActivity"
-                android:screenOrientation="portrait"
-                android:exported="true">
+            android:name="com.example.android.authentication.myvault.ui.MainActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -40,70 +41,64 @@
             </intent-filter>
         </activity>
         <activity
-                android:name="com.example.android.authentication.myvault.ui.CreatePasswordActivity"
-                android:enabled="true"
-                android:screenOrientation="portrait"
-                android:exported="true">
+            android:name="com.example.android.authentication.myvault.ui.CreatePasswordActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="com.example.android.authentication.myvault.CREATE_PASSWORD" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
         <activity
-                android:name="com.example.android.authentication.myvault.ui.CreatePasskeyActivity"
-                android:enabled="true"
-                android:screenOrientation="portrait"
-                android:exported="true">
+            android:name="com.example.android.authentication.myvault.ui.CreatePasskeyActivity"
+            android:enabled="true"
+            android:exported="true">
             <intent-filter>
                 <action android:name="com.example.android.authentication.myvault.CREATE_PASSKEY" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
 
         <activity
-                android:name=".ui.UnlockActivity"
-                android:enabled="true"
-                android:screenOrientation="portrait"
-                android:exported="true">
+            android:name=".ui.UnlockActivity"
+            android:enabled="true"
+            android:exported="true">
             <intent-filter>
                 <action android:name="com.example.android.authentication.myvault.UNLOCK_APP" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
         <activity
-                android:name=".ui.GetPasskeyActivity"
-                android:enabled="true"
-                android:screenOrientation="portrait"
-                android:exported="true">
+            android:name=".ui.GetPasskeyActivity"
+            android:enabled="true"
+            android:exported="true">
             <intent-filter>
                 <action android:name="com.example.android.authentication.myvault.GET_PASSKEY" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
         <activity
-                android:name="com.example.android.authentication.myvault.ui.GetPasswordActivity"
-                android:enabled="true"
-                android:screenOrientation="portrait"
-                android:exported="true">
+            android:name="com.example.android.authentication.myvault.ui.GetPasswordActivity"
+            android:enabled="true"
+            android:exported="true">
             <intent-filter>
                 <action android:name="com.example.android.authentication.myvault.GET_PASSWORD" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
 
         <service
-                android:name="com.example.android.authentication.myvault.data.MyVaultService"
-                android:enabled="true"
-                android:exported="true"
-                android:icon="@drawable/android_secure"
-                android:label="@string/service_name"
-                android:permission="android.permission.BIND_CREDENTIAL_PROVIDER_SERVICE">
+            android:name="com.example.android.authentication.myvault.data.MyVaultService"
+            android:enabled="true"
+            android:exported="true"
+            android:icon="@drawable/android_secure"
+            android:label="@string/service_name"
+            android:permission="android.permission.BIND_CREDENTIAL_PROVIDER_SERVICE">
             <intent-filter>
                 <action android:name="android.service.credentials.CredentialProviderService" />
             </intent-filter>
             <meta-data
-                    android:name="android.credentials.provider"
-                    android:resource="@xml/provider" />
+                android:name="android.credentials.provider"
+                android:resource="@xml/provider" />
         </service>
     </application>
 </manifest>

CredentialProvider/MyVault/app/src/main/java/com/example/android/authentication/myvault/ui/GetPasskeyActivity.kt

@@ -112,7 +112,10 @@ class GetPasskeyActivity : FragmentActivity() {
 
         // Extract the requestJson and clientDataHash from this option.
         var clientDataHash: ByteArray? = null
-        if (request.callingAppInfo.origin != null) {
+        var privilegedAllowlist: String = ""
+
+        // TODO: Cannot access 'val origin: String?': it is internal in 'androidx/credentials/provider/CallingAppInfo'.
+        if (request.callingAppInfo.getOrigin(privilegedAllowlist) != null) {
             clientDataHash = publicKeyRequest.clientDataHash
         }
 

CredentialProvider/MyVault/build.gradle.kts

@@ -1,6 +1,10 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
     alias(libs.plugins.android.application) apply false
-    alias(libs.plugins.jetbrains.kotlin.android) apply false
+    alias(libs.plugins.kotlin.compose.compiler) apply false
+    alias(libs.plugins.kotlin.android) apply false
     alias(libs.plugins.devtools.ksp) apply false
+    alias(libs.plugins.diffplug.spotless) apply false
+    alias(libs.plugins.androidx.navigation.safeargs) apply false
+    alias(libs.plugins.androidx.room) apply false
 }

CredentialProvider/MyVault/gradle/libs.versions.toml

@@ -1,51 +1,53 @@
 [versions]
-agp = "8.4.0"
-ksp = "1.9.22-1.0.17"
-kotlin = "1.9.22"
-coreKtx = "1.12.0"
-junit = "4.13.2"
-junitVersion = "1.1.5"
-espressoCore = "3.5.1"
-lifecycleRuntime = "2.8.2"
-activityCompose = "1.9.0"
-composeBom = "2024.06.00"
-credentials = "1.5.0-alpha02"
-room = "2.6.1"
-biometrics = "1.2.0-alpha05"
-accompanist = "0.28.0"
-navigation = "2.7.7"
-
-[libraries]
-androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
-junit = { group = "junit", name = "junit", version.ref = "junit" }
-androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" }
-androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" }
-androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycleRuntime" }
-androidx-lifecyle-runtime-compose = { group = "androidx.lifecycle", name = "lifecycle-runtime-compose", version.ref = "lifecycleRuntime" }
-androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" }
-androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" }
-androidx-ui = { group = "androidx.compose.ui", name = "ui" }
-androidx-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" }
-androidx-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }
-androidx-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" }
-androidx-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" }
-androidx-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" }
-androidx-material3 = { group = "androidx.compose.material3", name = "material3" }
-androidx-credential-manager = { group = "androidx.credentials", name = "credentials", version.ref = "credentials" }
-androidx-room-runtime = { group = "androidx.room", name = "room-runtime", version.ref = "room" }
-androidx-room-ktx = { group = "androidx.room", name = "room-ktx", version.ref = "room" }
-androidx-room-compiler = { group = "androidx.room", name = "room-compiler", version.ref = "room" }
-androidx-biometrics = { group = "androidx.biometric", name = "biometric", version.ref = "biometrics" }
-androidx-navigation = { group = "androidx.navigation", name = "navigation-compose", version.ref = "navigation" }
-google-accompanist = { group = "com.google.accompanist", name = "accompanist-systemuicontroller", version.ref = "accompanist" }
-
+android_gradle_plugin     = '8.6.0'
+devtools_ksp              = '2.0.20-1.0.25'
+google_accompanist        = '0.28.0'
+kotlin                    = '2.0.20'
+ktlint                    = '1.0.1'
+junit                     = '4.13.2'
+diffplug_spotless         = '6.25.0'
+androidx_core_ktx         = '1.13.1'
+androidx_test_ext_junit   = '1.2.1'
+androidx_test_espresso    = '3.6.1'
+androidx_lifecycle        = '2.8.5'
+androidx_activity_compose = '1.9.2'
+androidx_compose_bom      = '2024.09.00'
+androidx_credentials      = '1.5.0-alpha05'
+androidx_biometrics       = '1.2.0-alpha05'
+androidx_navigation       = '2.8.0'
+androidx_room             = '2.6.1'
 
 
 [plugins]
-android-application = { id = "com.android.application", version.ref = "agp" }
-jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
-devtools-ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
-
-
+android_application          = { id = "com.android.application", version.ref = "android_gradle_plugin" }
+kotlin_compose_compiler      = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
+kotlin_android               = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
+diffplug_spotless            = { id = "com.diffplug.spotless", version.ref = "diffplug_spotless" }
+devtools_ksp                 = { id = "com.google.devtools.ksp", version.ref = "devtools_ksp" }
+androidx_room                = { id = "androidx.room", version.ref = "androidx_room" }
+androidx_navigation_safeargs = { id = "androidx.navigation.safeargs", version.ref = "androidx_navigation" }
 
+[libraries]
+androidx_core_ktx                   = { group = "androidx.core", name = "core-ktx", version.ref = "androidx_core_ktx" }
+androidx_lifecycle_runtime_ktx      = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "androidx_lifecycle" }
+androidx_lifecycle_runtime_compose  = { group = "androidx.lifecycle", name = "lifecycle-runtime-compose", version.ref = "androidx_lifecycle" }
+androidx_activity_compose           = { group = "androidx.activity", name = "activity-compose", version.ref = "androidx_activity_compose" }
+androidx_compose_bom                = { group = "androidx.compose", name = "compose-bom", version.ref = "androidx_compose_bom" }
+androidx_compose_ui                 = { group = "androidx.compose.ui", name = "ui" }
+androidx_compose_ui_graphics        = { group = "androidx.compose.ui", name = "ui-graphics" }
+androidx_compose_ui_tooling         = { group = "androidx.compose.ui", name = "ui-tooling" }
+androidx_compose_ui_tooling_preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" }
+androidx_compose_ui_test_manifest   = { group = "androidx.compose.ui", name = "ui-test-manifest" }
+androidx_compose_ui_test_junit4     = { group = "androidx.compose.ui", name = "ui-test-junit4" }
+androidx_compose_material3          = { group = "androidx.compose.material3", name = "material3" }
+androidx_credentials                = { group = "androidx.credentials", name = "credentials", version.ref = "androidx_credentials" }
+androidx_room_runtime               = { group = "androidx.room", name = "room-runtime", version.ref = "androidx_room" }
+androidx_room_ktx                   = { group = "androidx.room", name = "room-ktx", version.ref = "androidx_room" }
+androidx_room_compiler              = { group = "androidx.room", name = "room-compiler", version.ref = "androidx_room" }
+androidx_biometrics                 = { group = "androidx.biometric", name = "biometric", version.ref = "androidx_biometrics" }
+androidx_navigation                 = { group = "androidx.navigation", name = "navigation-compose", version.ref = "androidx_navigation" }
+google_accompanist                  = { group = "com.google.accompanist", name = "accompanist-systemuicontroller", version.ref = "google_accompanist" }
+junit                               = { group = "junit", name = "junit", version.ref = "junit" }
+androidx_test_ext_junit             = { group = "androidx.test.ext", name = "junit", version.ref = "androidx_test_ext_junit" }
+androidx_test_espresso_core         = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "androidx_test_espresso" }
 

CredentialProvider/MyVault/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Wed Mar 27 12:33:40 IST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

CredentialProvider/MyVault/init.gradle.kts

@@ -14,31 +14,15 @@
  *   limitations under the License.
  */
 
-val ktlintVersion = "1.0.1"
-
-initscript {
-    val spotlessVersion = "6.23.3"
-
-    repositories {
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath("com.diffplug.spotless:spotless-plugin-gradle:$spotlessVersion")
-    }
-}
-
 rootProject {
     subprojects {
         apply<com.diffplug.gradle.spotless.SpotlessPlugin>()
         extensions.configure<com.diffplug.gradle.spotless.SpotlessExtension> {
             kotlin {
                 target("**/*.kt")
                 targetExclude("**/build/**/*.kt")
-                ktlint(ktlintVersion).editorConfigOverride(
-                    mapOf(
-                        "android" to "true",
-                    ),
+                ktlint(libs.versions.ktlint.get()).editorConfigOverride(
+                    mapOf("android" to "true")
                 )
                 licenseHeaderFile(rootProject.file("spotless/copyright.kt"))
             }