From bce64a8785432f96ed1d33eb8e57bea0c78d61ea Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 20 Apr 2025 20:59:17 +0000 Subject: [PATCH 1/4] Bump com.google.android.gms:play-services-base from 18.6.0 to 18.7.0 Bumps com.google.android.gms:play-services-base from 18.6.0 to 18.7.0. --- updated-dependencies: - dependency-name: com.google.android.gms:play-services-base dependency-version: 18.7.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- FlowCrypt/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FlowCrypt/build.gradle.kts b/FlowCrypt/build.gradle.kts index b373a3fc99..9b4df64f2d 100644 --- a/FlowCrypt/build.gradle.kts +++ b/FlowCrypt/build.gradle.kts @@ -463,7 +463,7 @@ dependencies { implementation("androidx.navigation:navigation-runtime-ktx:2.8.9") implementation("androidx.webkit:webkit:1.13.0") - implementation("com.google.android.gms:play-services-base:18.6.0") + implementation("com.google.android.gms:play-services-base:18.7.0") implementation("com.google.android.gms:play-services-auth:21.3.0") implementation("com.google.android.material:material:1.12.0") implementation("com.google.android.flexbox:flexbox:3.0.0") From 77ec1532abd0b3a30e573966db658ff5d03f0e10 Mon Sep 17 00:00:00 2001 From: denbond7 Date: Mon, 21 Apr 2025 16:20:52 +0300 Subject: [PATCH 2/4] wip --- FlowCrypt/build.gradle.kts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/FlowCrypt/build.gradle.kts b/FlowCrypt/build.gradle.kts index 72a6e5367d..ba47c274d3 100644 --- a/FlowCrypt/build.gradle.kts +++ b/FlowCrypt/build.gradle.kts @@ -183,6 +183,7 @@ android { } compileOptions { + isCoreLibraryDesugaringEnabled = true sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 } @@ -397,6 +398,8 @@ dependencies { ksp("dev.zacsweers.autoservice:auto-service-ksp:1.2.0") ksp("com.google.auto.service:auto-service:1.1.1") + coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.5") + devDebugImplementation("com.squareup.leakcanary:leakcanary-android:2.14") //uiTests is the build type for testing. //noinspection FragmentGradleConfiguration From e6a5cda8a436feb818d07af6233cee8755354405 Mon Sep 17 00:00:00 2001 From: denbond7 Date: Mon, 21 Apr 2025 17:27:54 +0300 Subject: [PATCH 3/4] wip --- .../java/com/flowcrypt/email/ui/base/BaseSignTest.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/base/BaseSignTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/base/BaseSignTest.kt index 48dca8a271..17a568d77a 100644 --- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/base/BaseSignTest.kt +++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/base/BaseSignTest.kt @@ -1,6 +1,6 @@ /* * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com - * Contributors: DenBond7 + * Contributors: denbond7 */ package com.flowcrypt.email.ui.base @@ -35,7 +35,7 @@ abstract class BaseSignTest : BaseTest() { protected fun setupAndClickSignInButton(signInAccountJson: String) { val intent = Intent() - intent.putExtra("googleSignInAccount", GoogleSignInAccount.zab(signInAccountJson)) + intent.putExtra("googleSignInAccount", GoogleSignInAccount.zaa(signInAccountJson)) val signInIntent = GoogleSignIn.getClient( getTargetContext(), @@ -94,7 +94,7 @@ abstract class BaseSignTest : BaseTest() { // The payload of the JWS is JSON content of the JWT Claims jws.payload = claims.toJson() - jws.setAlgorithmConstraints(AlgorithmConstraints.NO_CONSTRAINTS) + jws.algorithmConstraints = AlgorithmConstraints.NO_CONSTRAINTS // Set the signature algorithm on the JWT/JWS that will integrity protect the claims jws.algorithmHeaderValue = AlgorithmIdentifiers.NONE From 52b50866c0c950e25c763392301f9ea81795d999 Mon Sep 17 00:00:00 2001 From: denbond7 Date: Mon, 21 Apr 2025 20:45:26 +0300 Subject: [PATCH 4/4] wip --- .../java/com/flowcrypt/email/ui/base/BaseSignTest.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/base/BaseSignTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/base/BaseSignTest.kt index 17a568d77a..ba48d32f0d 100644 --- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/base/BaseSignTest.kt +++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/base/BaseSignTest.kt @@ -94,7 +94,7 @@ abstract class BaseSignTest : BaseTest() { // The payload of the JWS is JSON content of the JWT Claims jws.payload = claims.toJson() - jws.algorithmConstraints = AlgorithmConstraints.NO_CONSTRAINTS + jws.setAlgorithmConstraints(AlgorithmConstraints.NO_CONSTRAINTS) // Set the signature algorithm on the JWT/JWS that will integrity protect the claims jws.algorithmHeaderValue = AlgorithmIdentifiers.NONE