Merge branch 'release/1.1.6' into main

rafakob · rafakob · commit 5ee8df4c9892 · 2025-08-23T14:33:26.000+02:00
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -23,8 +23,8 @@ android {
 
     defaultConfig {
         applicationId = "com.twofasapp.pass"
-        versionName = "1.1.2"
-        versionCode = 25
+        versionName = "1.1.6"
+        versionCode = 26
     }
 
     applicationVariants.all {
diff --git a/buildlogic/src/main/java/com/twofasapp/buildlogic/extension/KotlinAndroid.kt b/buildlogic/src/main/java/com/twofasapp/buildlogic/extension/KotlinAndroid.kt
@@ -12,6 +12,7 @@ import com.android.build.api.dsl.CommonExtension
 import com.twofasapp.buildlogic.version.SdkConfig
 import org.gradle.api.JavaVersion
 import org.gradle.api.Project
+import org.gradle.api.tasks.testing.Test
 import org.gradle.kotlin.dsl.assign
 import org.gradle.kotlin.dsl.dependencies
 import org.gradle.kotlin.dsl.withType
@@ -68,6 +69,10 @@ internal fun Project.applyKotlinAndroid(
             }
         }
 
+        tasks.withType<Test>().configureEach {
+            failOnNoDiscoveredTests = false
+        }
+
         configureKotlin()
     }
 
diff --git a/data/cloud/src/main/java/com/twofasapp/data/cloud/authenticate/AuthenticateCloudService.kt b/data/cloud/src/main/java/com/twofasapp/data/cloud/authenticate/AuthenticateCloudService.kt
@@ -12,9 +12,11 @@ import androidx.compose.runtime.Composable
 import com.twofasapp.data.cloud.domain.CloudConfig
 
 enum class CloudServiceType {
-    GoogleDrive,
+    GoogleDrive, LegacyGoogleDrive
 }
 
+val DefaultCloudServiceType = CloudServiceType.LegacyGoogleDrive
+
 @Composable
 fun AuthenticateCloudService(
     type: CloudServiceType,
@@ -30,5 +32,13 @@ fun AuthenticateCloudService(
                 onError = onError,
             )
         }
+
+        CloudServiceType.LegacyGoogleDrive -> {
+            AuthenticateWithLegacyGoogle(
+                onDismissRequest = onDismissRequest,
+                onSuccess = onSuccess,
+                onError = onError,
+            )
+        }
     }
 }
diff --git a/data/cloud/src/main/java/com/twofasapp/data/cloud/authenticate/AuthenticateWithLegacyGoogle.kt b/data/cloud/src/main/java/com/twofasapp/data/cloud/authenticate/AuthenticateWithLegacyGoogle.kt
@@ -0,0 +1,76 @@
+/*
+ * SPDX-License-Identifier: BUSL-1.1
+ *
+ * Copyright © 2025 Two Factor Authentication Service, Inc.
+ * Licensed under the Business Source License 1.1
+ * See LICENSE file for full terms
+ */
+
+package com.twofasapp.data.cloud.authenticate
+
+import android.app.Activity
+import androidx.activity.compose.rememberLauncherForActivityResult
+import androidx.activity.result.ActivityResult
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.ui.platform.LocalContext
+import com.google.android.gms.auth.api.signin.GoogleSignIn
+import com.google.android.gms.auth.api.signin.GoogleSignInOptions
+import com.google.android.gms.common.api.Scope
+import com.google.api.services.drive.DriveScopes
+import com.twofasapp.core.android.ktx.currentActivity
+import com.twofasapp.core.common.services.CrashlyticsInstance
+import com.twofasapp.data.cloud.domain.CloudConfig
+
+@Composable
+internal fun AuthenticateWithLegacyGoogle(
+    onDismissRequest: () -> Unit = {},
+    onSuccess: (CloudConfig.GoogleDrive) -> Unit = {},
+    onError: (Exception) -> Unit = {},
+) {
+    val activity = LocalContext.currentActivity
+
+    val authorizationIntentLauncher =
+        rememberLauncherForActivityResult(ActivityResultContracts.StartActivityForResult()) { result: ActivityResult ->
+            if (result.resultCode == Activity.RESULT_OK) {
+                if (result.data != null) {
+                    GoogleSignIn.getSignedInAccountFromIntent(result.data)
+                        .addOnSuccessListener {
+                            if (it.grantedScopes.contains(Scope(DriveScopes.DRIVE_APPDATA))) {
+                                onSuccess(
+                                    CloudConfig.GoogleDrive(
+                                        id = it.email.orEmpty(),
+                                        credentialType = it.account?.type.orEmpty(),
+                                    ),
+                                )
+                                onDismissRequest()
+                            } else {
+                                onDismissRequest()
+                            }
+                        }
+                        .addOnCanceledListener { onDismissRequest() }
+                        .addOnFailureListener { onError(it) }
+                } else {
+                    CrashlyticsInstance.logException(IllegalStateException("Legacy Authorization data is empty."))
+                    onDismissRequest()
+                }
+            } else {
+                CrashlyticsInstance.logException(IllegalStateException("Legacy Authorization result failed."))
+                onDismissRequest()
+            }
+        }
+
+    LaunchedEffect(Unit) {
+        val signInOptions = GoogleSignInOptions.Builder()
+            .requestEmail()
+            .requestScopes(Scope(DriveScopes.DRIVE_APPDATA))
+            .build()
+
+        val client = GoogleSignIn.getClient(activity, signInOptions)
+
+        client.signInIntent
+
+        authorizationIntentLauncher.launch(client.signInIntent)
+    }
+}
diff --git a/data/cloud/src/main/java/com/twofasapp/data/cloud/services/googledrive/GoogleDriveCloudService.kt b/data/cloud/src/main/java/com/twofasapp/data/cloud/services/googledrive/GoogleDriveCloudService.kt
@@ -13,6 +13,9 @@ import android.content.Context
 import androidx.credentials.ClearCredentialStateRequest
 import androidx.credentials.CredentialManager
 import com.google.android.gms.auth.UserRecoverableAuthException
+import com.google.android.gms.auth.api.signin.GoogleSignIn
+import com.google.android.gms.auth.api.signin.GoogleSignInOptions
+import com.google.android.gms.common.api.Scope
 import com.google.api.client.googleapis.extensions.android.gms.auth.GoogleAccountCredential
 import com.google.api.client.googleapis.extensions.android.gms.auth.UserRecoverableAuthIOException
 import com.google.api.client.http.ByteArrayContent
@@ -21,6 +24,8 @@ import com.google.api.client.json.gson.GsonFactory
 import com.google.api.services.drive.Drive
 import com.google.api.services.drive.DriveScopes
 import com.google.api.services.drive.model.File
+import com.twofasapp.data.cloud.authenticate.CloudServiceType
+import com.twofasapp.data.cloud.authenticate.DefaultCloudServiceType
 import com.twofasapp.data.cloud.domain.CloudConfig
 import com.twofasapp.data.cloud.domain.CloudFileInfo
 import com.twofasapp.data.cloud.domain.CloudResult
@@ -301,9 +306,23 @@ internal class GoogleDriveCloudService(
     }
 
     override suspend fun disconnect() {
-        CredentialManager.create(context).clearCredentialState(
-            ClearCredentialStateRequest(),
-        )
+        when (DefaultCloudServiceType) {
+            CloudServiceType.GoogleDrive -> {
+                CredentialManager.create(context).clearCredentialState(
+                    ClearCredentialStateRequest(),
+                )
+            }
+
+            CloudServiceType.LegacyGoogleDrive -> {
+                GoogleSignIn.getClient(
+                    context,
+                    GoogleSignInOptions.Builder()
+                        .requestEmail()
+                        .requestScopes(Scope(DriveScopes.DRIVE_APPDATA))
+                        .build(),
+                ).signOut()
+            }
+        }
     }
 
     private fun CloudConfig.GoogleDrive.drive(): Drive {
diff --git a/data/purchases/src/main/java/com/twofasapp/data/purchases/domain/Entitlements.kt b/data/purchases/src/main/java/com/twofasapp/data/purchases/domain/Entitlements.kt
@@ -15,7 +15,7 @@ data class Entitlements(
 ) {
     companion object {
         val Free = Entitlements(
-            itemsLimit = 50,
+            itemsLimit = 200,
             unlimitedConnectedBrowsers = false,
             multiDeviceSync = false,
         )
diff --git a/feature/cloudsync/src/main/java/com/twofasapp/feature/cloudsync/ui/googledrive/GoogleDriveSyncScreen.kt b/feature/cloudsync/src/main/java/com/twofasapp/feature/cloudsync/ui/googledrive/GoogleDriveSyncScreen.kt
@@ -38,7 +38,7 @@ import com.twofasapp.core.design.foundation.preview.PreviewTheme
 import com.twofasapp.core.design.foundation.topbar.TopAppBar
 import com.twofasapp.core.locale.MdtLocale
 import com.twofasapp.data.cloud.authenticate.AuthenticateCloudService
-import com.twofasapp.data.cloud.authenticate.CloudServiceType
+import com.twofasapp.data.cloud.authenticate.DefaultCloudServiceType
 import com.twofasapp.data.cloud.domain.CloudConfig
 import com.twofasapp.feature.cloudsync.ui.common.SyncStatus
 import org.koin.androidx.compose.koinViewModel
@@ -144,7 +144,7 @@ private fun Content(
 
     if (showCloudAuthentication) {
         AuthenticateCloudService(
-            type = CloudServiceType.GoogleDrive,
+            type = DefaultCloudServiceType,
             onDismissRequest = { showCloudAuthentication = false },
             onSuccess = onCloudAuthenticated,
             onError = onCloudAuthenticationError,
diff --git a/feature/startup/src/main/java/com/twofasapp/feature/startup/ui/restorevault/RestoreVaultScreen.kt b/feature/startup/src/main/java/com/twofasapp/feature/startup/ui/restorevault/RestoreVaultScreen.kt
@@ -46,7 +46,7 @@ import com.twofasapp.core.design.theme.RoundedShape16
 import com.twofasapp.core.design.theme.ScreenPadding
 import com.twofasapp.core.locale.MdtLocale
 import com.twofasapp.data.cloud.authenticate.AuthenticateCloudService
-import com.twofasapp.data.cloud.authenticate.CloudServiceType
+import com.twofasapp.data.cloud.authenticate.DefaultCloudServiceType
 import org.koin.androidx.compose.koinViewModel
 
 @Composable
@@ -83,7 +83,7 @@ internal fun RestoreVaultScreen(
 
     if (showCloudAuthentication) {
         AuthenticateCloudService(
-            type = CloudServiceType.GoogleDrive,
+            type = DefaultCloudServiceType,
             onDismissRequest = { showCloudAuthentication = false },
             onSuccess = {
                 viewModel.updateRestoreCloudConfig(it)
diff --git a/gradle.properties b/gradle.properties
@@ -6,11 +6,12 @@
 # http://www.gradle.org/docs/current/userguide/build_environment.html
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx4096m -Dfile.encoding=UTF-8
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. For more details, visit
 # https://developer.android.com/r/tools/gradle-multi-project-decoupled-projects
-# org.gradle.parallel=true
+org.gradle.parallel=true
+org.gradle.caching=true
 # AndroidX package structure to make it clearer which packages are bundled with the
 # Android operating system, and which are packaged with your app's APK
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,27 +1,27 @@
 [versions]
-agp = "8.11.1"
+agp = "8.12.1"
 cameraX = "1.4.2"
 coil = "3.3.0"
 composeActivity = "1.10.1"
-composeNavigation = "2.9.2"
-composeBom = "2025.07.00"
+composeNavigation = "2.9.3"
+composeBom = "2025.08.00"
 credentials = "1.5.0"
-firebase = "34.0.0"
+firebase = "34.1.0"
 elmyr = "1.3.4"
 koin = "4.1.0"
-kotlin = "2.2.0"
+kotlin = "2.2.10"
 kotlinCoroutines = "1.10.2"
-kotlinKsp = "2.2.0-2.0.2"
-ktor = "3.2.2"
+kotlinKsp = "2.2.10-2.0.2"
+ktor = "3.2.3"
 ktlint = "5.1.1"
 lifecycle = "2.9.2"
 room = "2.7.2"
 pluto = "3.0.1"
-revenuecat = "9.1.2"
+revenuecat = "9.3.0"
 junit = "4.13.2"
-kotest = "5.9.1"
-espresso = "3.6.1"
-uiAndroid = "1.8.3"
+kotest = "6.0.0"
+espresso = "3.7.0"
+uiAndroid = "1.9.0"
 aboutLibraries = "12.2.4"
 
 [libraries]
@@ -50,7 +50,6 @@ composeUi = { module = "androidx.compose.ui:ui" }
 composeUiTooling = { module = "androidx.compose.ui:ui-tooling" }
 credentialsPlayServices = { module = "androidx.credentials:credentials-play-services-auth", version.ref = "credentials" }
 credentials = { module = "androidx.credentials:credentials", version.ref = "credentials" }
-core = "androidx.core:core-ktx:1.16.0"
 coreSplash = "androidx.core:core-splashscreen:1.0.1"
 colorPicker = "com.github.skydoves:colorpicker-compose:1.1.2"
 dataStore = "androidx.datastore:datastore-preferences:1.1.7"
@@ -60,7 +59,7 @@ firebaseCrashlytics = { module = "com.google.firebase:firebase-crashlytics" }
 firebaseMessaging = { module = "com.google.firebase:firebase-messaging" }
 elmyrCore = { module = "com.github.xgouchet.Elmyr:core", version.ref = "elmyr" }
 elmyrJunit4 = { module = "com.github.xgouchet.Elmyr:junit4", version.ref = "elmyr" }
-googleApiClientAndroid = "com.google.api-client:google-api-client-android:2.8.0"
+googleApiClientAndroid = "com.google.api-client:google-api-client-android:2.8.1"
 googleAuth = "com.google.android.gms:play-services-auth:21.4.0"
 googleDrive = "com.google.apis:google-api-services-drive:v3-rev20250717-2.0.0"
 googleId = "com.google.android.libraries.identity.googleid:googleid:1.1.1"
@@ -84,7 +83,7 @@ lifecycleProcess = { module = "androidx.lifecycle:lifecycle-process", version.re
 lifecycleSavedstate = { module = "androidx.lifecycle:lifecycle-viewmodel-savedstate", version.ref = "lifecycle" }
 lottie = "com.airbnb.android:lottie-compose:6.6.7"
 material = "com.google.android.material:material:1.12.0"
-opencsv = "com.opencsv:opencsv:5.11.2"
+opencsv = "com.opencsv:opencsv:5.12.0"
 playServicesCorutines = "org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.10.2"
 revenuecat = { module = "com.revenuecat.purchases:purchases", version.ref = "revenuecat" }
 revenuecatUi = { module = "com.revenuecat.purchases:purchases-ui", version.ref = "revenuecat" }
@@ -93,7 +92,7 @@ roomKtx = { module = "androidx.room:room-ktx", version.ref = "room" }
 roomRuntime = { module = "androidx.room:room-runtime", version.ref = "room" }
 timber = "com.jakewharton.timber:timber:5.0.1"
 truetime = "com.github.instacart:truetime-android:4.0.0.alpha"
-workManager = "androidx.work:work-runtime-ktx:2.10.2"
+workManager = "androidx.work:work-runtime-ktx:2.10.3"
 webkit = "androidx.webkit:webkit:1.14.0"
 pdfbox = "com.tom-roush:pdfbox-android:2.0.27.0"
 pluto = { module = "com.androidpluto:pluto", version.ref = "pluto" }
@@ -111,9 +110,9 @@ turbine = "app.cash.turbine:turbine:1.2.1"
 uiTestJunit = { module = "androidx.compose.ui:ui-test-junit4" }
 uiTestManifest = { module = "androidx.compose.ui:ui-test-manifest" }
 uiTestNavigation = { module = "androidx.navigation:navigation-testing", version.ref = "composeNavigation" }
-uiTestRunner = "androidx.test:runner:1.6.2"
-uiTestOrchestrator = "androidx.test:orchestrator:1.5.1"
-testCore = "androidx.test:core:1.6.1"
+uiTestRunner = "androidx.test:runner:1.7.0"
+uiTestOrchestrator = "androidx.test:orchestrator:1.6.1"
+testCore = "androidx.test:core:1.7.0"
 robolectric = "org.robolectric:robolectric:4.15.1"
 slf4jNoOp = "org.slf4j:slf4j-nop:2.0.17"
 kotlinCoroutinesTest = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinCoroutines" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Fri Jan 12 15:54:17 CET 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,8 @@ android {`
`23`	`23`
`24`	`24`	`defaultConfig {`
`25`	`25`	`applicationId = "com.twofasapp.pass"`
`26`		`- versionName = "1.1.2"`
`27`		`- versionCode = 25`
	`26`	`+ versionName = "1.1.6"`
	`27`	`+ versionCode = 26`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`applicationVariants.all {`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ import com.android.build.api.dsl.CommonExtension`
`12`	`12`	`import com.twofasapp.buildlogic.version.SdkConfig`
`13`	`13`	`import org.gradle.api.JavaVersion`
`14`	`14`	`import org.gradle.api.Project`
	`15`	`+import org.gradle.api.tasks.testing.Test`
`15`	`16`	`import org.gradle.kotlin.dsl.assign`
`16`	`17`	`import org.gradle.kotlin.dsl.dependencies`
`17`	`18`	`import org.gradle.kotlin.dsl.withType`
`@@ -68,6 +69,10 @@ internal fun Project.applyKotlinAndroid(`
`68`	`69`	`}`
`69`	`70`	`}`
`70`	`71`
	`72`	`+ tasks.withType<Test>().configureEach {`
	`73`	`+ failOnNoDiscoveredTests = false`
	`74`	`+ }`
	`75`	`+`
`71`	`76`	`configureKotlin()`
`72`	`77`	`}`
`73`	`78`
Original file line number	Diff line number	Diff line change
`@@ -12,9 +12,11 @@ import androidx.compose.runtime.Composable`
`12`	`12`	`import com.twofasapp.data.cloud.domain.CloudConfig`
`13`	`13`
`14`	`14`	`enum class CloudServiceType {`
`15`		`- GoogleDrive,`
	`15`	`+ GoogleDrive, LegacyGoogleDrive`
`16`	`16`	`}`
`17`	`17`
	`18`	`+val DefaultCloudServiceType = CloudServiceType.LegacyGoogleDrive`
	`19`	`+`
`18`	`20`	`@Composable`
`19`	`21`	`fun AuthenticateCloudService(`
`20`	`22`	`type: CloudServiceType,`
`@@ -30,5 +32,13 @@ fun AuthenticateCloudService(`
`30`	`32`	`onError = onError,`
`31`	`33`	`)`
`32`	`34`	`}`
	`35`	`+`
	`36`	`+ CloudServiceType.LegacyGoogleDrive -> {`
	`37`	`+ AuthenticateWithLegacyGoogle(`
	`38`	`+ onDismissRequest = onDismissRequest,`
	`39`	`+ onSuccess = onSuccess,`
	`40`	`+ onError = onError,`
	`41`	`+ )`
	`42`	`+ }`
`33`	`43`	`}`
`34`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ data class Entitlements(`
`15`	`15`	`) {`
`16`	`16`	`companion object {`
`17`	`17`	`val Free = Entitlements(`
`18`		`- itemsLimit = 50,`
	`18`	`+ itemsLimit = 200,`
`19`	`19`	`unlimitedConnectedBrowsers = false,`
`20`	`20`	`multiDeviceSync = false,`
`21`	`21`	`)`