-
Notifications
You must be signed in to change notification settings - Fork 1k
[PM-27903] feat: Remove Credential Exchange (CXF) dependency on f-droid builds #7154
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.
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
Open
vvolkgang
wants to merge
7
commits into
main
Choose a base branch
from
vvolkgang/fdroid-cxpv2
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
73d9e05
Disable Credential Exchange on F-Droid builds
vvolkgang 710cb44
Revert ImportItemsScreen changes
vvolkgang c8584ac
Revert isSupported
vvolkgang 37803c3
fix unit tests
vvolkgang fe0696e
format
vvolkgang 8edf743
Exclude new testStandard and testFdroid folders from detekt
vvolkgang e0ffc09
Merge branch 'main' into vvolkgang/fdroid-cxpv2
vvolkgang File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
24 changes: 24 additions & 0 deletions
24
cxf/src/fdroid/kotlin/com/bitwarden/cxf/importer/CredentialExchangeImporterImpl.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| package com.bitwarden.cxf.importer | ||
|
|
||
| import android.content.Context | ||
| import androidx.credentials.providerevents.exception.ImportCredentialsUnknownErrorException | ||
| import com.bitwarden.annotation.OmitFromCoverage | ||
| import com.bitwarden.cxf.importer.model.ImportCredentialsSelectionResult | ||
|
|
||
| /** | ||
| * F-Droid implementation of [CredentialExchangeImporter]. Credential exchange relies on the | ||
| * Play Services backend, which is not available on F-Droid builds, so import is unsupported and | ||
| * always reports a failure if invoked. | ||
| */ | ||
| @OmitFromCoverage | ||
| @Suppress("UnusedParameter") | ||
| internal class CredentialExchangeImporterImpl( | ||
| activity: Context, | ||
| ) : CredentialExchangeImporter { | ||
|
|
||
| override suspend fun importCredentials( | ||
| credentialTypes: List<String>, | ||
| ): ImportCredentialsSelectionResult = ImportCredentialsSelectionResult.Failure( | ||
| error = ImportCredentialsUnknownErrorException(), | ||
| ) | ||
| } |
29 changes: 29 additions & 0 deletions
29
cxf/src/fdroid/kotlin/com/bitwarden/cxf/registry/CredentialExchangeRegistryImpl.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| package com.bitwarden.cxf.registry | ||
|
|
||
| import android.app.Application | ||
| import androidx.credentials.providerevents.transfer.ClearExportResponse | ||
| import androidx.credentials.providerevents.transfer.RegisterExportResponse | ||
| import com.bitwarden.annotation.OmitFromCoverage | ||
| import com.bitwarden.core.data.util.asFailure | ||
| import com.bitwarden.cxf.registry.model.RegistrationRequest | ||
|
|
||
| /** | ||
| * F-Droid implementation of [CredentialExchangeRegistry]. Registration relies on the Play Services | ||
| * backend, which is not available on F-Droid builds, so registration is a no-op that always fails. | ||
| */ | ||
| @OmitFromCoverage | ||
| @Suppress("UnusedParameter") | ||
| internal class CredentialExchangeRegistryImpl( | ||
| application: Application, | ||
| ) : CredentialExchangeRegistry { | ||
|
|
||
| override suspend fun register( | ||
| registrationRequest: RegistrationRequest, | ||
| ): Result<RegisterExportResponse> = | ||
| UnsupportedOperationException("Credential exchange is not supported on F-Droid builds.") | ||
| .asFailure() | ||
|
|
||
| override suspend fun unregister(): Result<ClearExportResponse> = | ||
| UnsupportedOperationException("Credential exchange is not supported on F-Droid builds.") | ||
| .asFailure() | ||
| } |
File renamed without changes.
File renamed without changes.
22 changes: 22 additions & 0 deletions
22
cxf/src/testFdroid/kotlin/com/bitwarden/cxf/importer/CredentialExchangeImporterTest.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| package com.bitwarden.cxf.importer | ||
|
|
||
| import android.app.Activity | ||
| import com.bitwarden.cxf.importer.model.ImportCredentialsSelectionResult | ||
| import io.mockk.mockk | ||
| import kotlinx.coroutines.test.runTest | ||
| import org.junit.jupiter.api.Assertions.assertTrue | ||
| import org.junit.jupiter.api.Test | ||
|
|
||
| class CredentialExchangeImporterTest { | ||
|
|
||
| private val importer = CredentialExchangeImporterImpl( | ||
| activity = mockk<Activity>(relaxed = true), | ||
| ) | ||
|
|
||
| @Test | ||
| fun `importCredentials should return Failure`() = runTest { | ||
| val result = importer.importCredentials(listOf("basic-auth")) | ||
|
|
||
| assertTrue(result is ImportCredentialsSelectionResult.Failure) | ||
| } | ||
| } |
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
π