Skip to content

Commit c00cdc7

Browse files
Run formatter on the app (#4444)
1 parent 4bab5a5 commit c00cdc7

File tree

31 files changed

+148
-139
lines changed

31 files changed

+148
-139
lines changed

app/src/main/java/com/x8bit/bitwarden/data/auth/manager/TrustedDeviceManagerImpl.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,5 +55,5 @@ class TrustedDeviceManagerImpl(
5555
authDiskSource.storeIsTdeLoginComplete(userId = userId, isTdeLoginComplete = true)
5656
}
5757
.also { authDiskSource.storeShouldTrustDevice(userId = userId, shouldTrustDevice = null) }
58-
.map { Unit }
58+
.map { }
5959
}

app/src/main/java/com/x8bit/bitwarden/data/autofill/fido2/manager/Fido2CredentialManager.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ package com.x8bit.bitwarden.data.autofill.fido2.manager
22

33
import androidx.credentials.provider.CallingAppInfo
44
import com.bitwarden.vault.CipherView
5+
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2CreateCredentialRequest
56
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2CredentialAssertionRequest
67
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2CredentialAssertionResult
7-
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2CreateCredentialRequest
88
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2RegisterCredentialResult
99
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2ValidateOriginResult
1010
import com.x8bit.bitwarden.data.autofill.fido2.model.PasskeyAssertionOptions

app/src/main/java/com/x8bit/bitwarden/data/autofill/fido2/manager/Fido2CredentialManagerImpl.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import com.bitwarden.sdk.Fido2CredentialStore
88
import com.bitwarden.vault.CipherView
99
import com.x8bit.bitwarden.data.autofill.fido2.datasource.network.model.DigitalAssetLinkResponseJson
1010
import com.x8bit.bitwarden.data.autofill.fido2.datasource.network.service.DigitalAssetLinkService
11+
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2CreateCredentialRequest
1112
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2CredentialAssertionRequest
1213
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2CredentialAssertionResult
13-
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2CreateCredentialRequest
1414
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2RegisterCredentialResult
1515
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2ValidateOriginResult
1616
import com.x8bit.bitwarden.data.autofill.fido2.model.PasskeyAssertionOptions

app/src/main/java/com/x8bit/bitwarden/data/autofill/fido2/util/Fido2IntentUtils.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import androidx.credentials.CreatePublicKeyCredentialRequest
66
import androidx.credentials.GetPublicKeyCredentialOption
77
import androidx.credentials.provider.BeginGetPublicKeyCredentialOption
88
import androidx.credentials.provider.PendingIntentHandler
9-
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2CredentialAssertionRequest
109
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2CreateCredentialRequest
10+
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2CredentialAssertionRequest
1111
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2GetCredentialsRequest
1212
import com.x8bit.bitwarden.data.platform.util.isBuildVersionBelow
1313
import com.x8bit.bitwarden.ui.platform.manager.intent.EXTRA_KEY_CIPHER_ID

app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/legacy/LegacySecureStorageImpl.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ private class AndroidKeyStore(
172172
private val useSymmetricPreferenceKey: String = "essentials_use_symmetric"
173173

174174
private val prefsMasterKey = "SecureStorageKey"
175-
private val initializationVectorLen = 12; // Android supports an IV of 12 for AES/GCM
175+
private val initializationVectorLen = 12 // Android supports an IV of 12 for AES/GCM
176176

177177
init {
178178
keyStore.load(null)

app/src/main/java/com/x8bit/bitwarden/data/platform/manager/model/SpecialCircumstance.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.x8bit.bitwarden.data.platform.manager.model
22

33
import android.os.Parcelable
4-
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2CredentialAssertionRequest
54
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2CreateCredentialRequest
5+
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2CredentialAssertionRequest
66
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2GetCredentialsRequest
77
import com.x8bit.bitwarden.data.autofill.model.AutofillSaveItem
88
import com.x8bit.bitwarden.data.autofill.model.AutofillSelectionData

app/src/main/java/com/x8bit/bitwarden/data/platform/manager/util/SpecialCircumstanceExtensions.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.x8bit.bitwarden.data.platform.manager.util
22

3-
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2CredentialAssertionRequest
43
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2CreateCredentialRequest
4+
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2CredentialAssertionRequest
55
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2GetCredentialsRequest
66
import com.x8bit.bitwarden.data.autofill.model.AutofillSaveItem
77
import com.x8bit.bitwarden.data.autofill.model.AutofillSelectionData

app/src/main/java/com/x8bit/bitwarden/ui/platform/base/BaseViewModel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ abstract class BaseViewModel<S, E, A>(
6666
* Any changes to internal state that first require asynchronous work should post a follow-up
6767
* action that may be used to then update the state synchronously.
6868
*/
69-
protected abstract fun handleAction(action: A): Unit
69+
protected abstract fun handleAction(action: A)
7070

7171
/**
7272
* Convenience method for sending an action to the [actionChannel].

app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/rootnav/RootNavViewModel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import com.x8bit.bitwarden.data.auth.repository.AuthRepository
77
import com.x8bit.bitwarden.data.auth.repository.model.AuthState
88
import com.x8bit.bitwarden.data.auth.repository.model.UserState
99
import com.x8bit.bitwarden.data.auth.repository.util.parseJwtTokenDataOrNull
10-
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2CredentialAssertionRequest
1110
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2CreateCredentialRequest
11+
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2CredentialAssertionRequest
1212
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2GetCredentialsRequest
1313
import com.x8bit.bitwarden.data.autofill.model.AutofillSaveItem
1414
import com.x8bit.bitwarden.data.autofill.model.AutofillSelectionData

app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/exportvault/ExportVaultViewModel.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ class ExportVaultViewModel @Inject constructor(
130130
is RequestOtpResult.Error -> {
131131
result.message?.asText() ?: R.string.generic_error_message.asText()
132132
}
133+
133134
RequestOtpResult.Success -> R.string.code_sent.asText()
134135
}
135136
sendEvent(ExportVaultEvent.ShowToast(message = toastMessage))

app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemAttachmentContent.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@ fun AttachmentItemContent(
5151
style = BitwardenTheme.typography.bodyMedium,
5252
maxLines = 1,
5353
overflow = TextOverflow.Ellipsis,
54-
modifier = Modifier.weight(1f)
54+
modifier = Modifier
55+
.weight(1f)
5556
.testTag("AttachmentNameLabel"),
5657
)
5758

app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemSshKeyContent.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,8 +195,8 @@ fun VaultItemSshKeyContent(
195195
.fillMaxWidth()
196196
.padding(start = 16.dp),
197197
attachmentItem = attachmentItem,
198-
onAttachmentDownloadClick =
199-
vaultCommonItemTypeHandlers.onAttachmentDownloadClick,
198+
onAttachmentDownloadClick = vaultCommonItemTypeHandlers
199+
.onAttachmentDownloadClick,
200200
)
201201
}
202202
item { Spacer(modifier = Modifier.height(8.dp)) }

app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ import com.x8bit.bitwarden.data.platform.manager.event.OrganizationEventManager
3232
import com.x8bit.bitwarden.data.platform.manager.model.OrganizationEvent
3333
import com.x8bit.bitwarden.data.platform.manager.util.toAutofillSelectionDataOrNull
3434
import com.x8bit.bitwarden.data.platform.manager.util.toFido2AssertionRequestOrNull
35-
import com.x8bit.bitwarden.data.platform.manager.util.toFido2GetCredentialsRequestOrNull
3635
import com.x8bit.bitwarden.data.platform.manager.util.toFido2CreateRequestOrNull
36+
import com.x8bit.bitwarden.data.platform.manager.util.toFido2GetCredentialsRequestOrNull
3737
import com.x8bit.bitwarden.data.platform.manager.util.toTotpDataOrNull
3838
import com.x8bit.bitwarden.data.platform.repository.EnvironmentRepository
3939
import com.x8bit.bitwarden.data.platform.repository.SettingsRepository

app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/qrcodescan/QrCodeScanScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ private fun CameraPreview(
261261

262262
val preview = Preview.Builder()
263263
.build()
264-
.apply { setSurfaceProvider(previewView.surfaceProvider) }
264+
.apply { surfaceProvider = previewView.surfaceProvider }
265265

266266
// Unbind from the camera provider when we leave the screen.
267267
DisposableEffect(Unit) {

app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultViewModel.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -580,6 +580,7 @@ class VaultViewModel @Inject constructor(
580580
vaultData = vaultData,
581581
showSshKeys = showSshKeys,
582582
)
583+
583584
is DataState.Pending -> vaultPendingReceive(vaultData = vaultData)
584585
}
585586
}

app/src/test/java/com/x8bit/bitwarden/MainViewModelTest.kt

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ import com.x8bit.bitwarden.data.auth.util.getPasswordlessRequestDataIntentOrNull
1616
import com.x8bit.bitwarden.data.autofill.accessibility.manager.AccessibilitySelectionManager
1717
import com.x8bit.bitwarden.data.autofill.accessibility.manager.AccessibilitySelectionManagerImpl
1818
import com.x8bit.bitwarden.data.autofill.fido2.manager.Fido2CredentialManager
19-
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2CredentialAssertionRequest
2019
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2CreateCredentialRequest
20+
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2CredentialAssertionRequest
2121
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2GetCredentialsRequest
2222
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2ValidateOriginResult
2323
import com.x8bit.bitwarden.data.autofill.fido2.model.createMockFido2CredentialAssertionRequest
@@ -609,7 +609,9 @@ class MainViewModelTest : BaseViewModelTest() {
609609
signingInfo = SigningInfo(),
610610
origin = "mockOrigin",
611611
)
612-
val fido2Intent = createMockIntent(mockFido2CreateCredentialRequest = fido2CreateCredentialRequest)
612+
val fido2Intent = createMockIntent(
613+
mockFido2CreateCredentialRequest = fido2CreateCredentialRequest,
614+
)
613615

614616
coEvery {
615617
fido2CredentialManager.validateOrigin(
@@ -662,7 +664,9 @@ class MainViewModelTest : BaseViewModelTest() {
662664
signingInfo = SigningInfo(),
663665
origin = "mockOrigin",
664666
)
665-
val mockIntent = createMockIntent(mockFido2CreateCredentialRequest = fido2CreateCredentialRequest)
667+
val mockIntent = createMockIntent(
668+
mockFido2CreateCredentialRequest = fido2CreateCredentialRequest,
669+
)
666670
coEvery {
667671
fido2CredentialManager.validateOrigin(
668672
fido2CreateCredentialRequest.callingAppInfo,
@@ -690,7 +694,9 @@ class MainViewModelTest : BaseViewModelTest() {
690694
signingInfo = SigningInfo(),
691695
origin = "mockOrigin",
692696
)
693-
val mockIntent = createMockIntent(mockFido2CreateCredentialRequest = fido2CreateCredentialRequest)
697+
val mockIntent = createMockIntent(
698+
mockFido2CreateCredentialRequest = fido2CreateCredentialRequest,
699+
)
694700
coEvery {
695701
fido2CredentialManager.validateOrigin(
696702
fido2CreateCredentialRequest.callingAppInfo,

app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/disk/AuthDiskSourceTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1266,7 +1266,7 @@ private const val USER_STATE_JSON = """
12661266
"kdfIterations": 600000,
12671267
"kdfMemory": 16,
12681268
"kdfParallelism": 4,
1269-
"userDecryptionOptions": {
1269+
"userDecryptionOptions": {
12701270
"hasMasterPassword": true,
12711271
"trustedDeviceOption": {
12721272
"encryptedPrivateKey": "encryptedPrivateKey",

app/src/test/java/com/x8bit/bitwarden/data/autofill/fido2/manager/Fido2CredentialManagerTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ import com.bitwarden.sdk.Fido2CredentialStore
1212
import com.x8bit.bitwarden.data.autofill.fido2.datasource.network.model.DigitalAssetLinkResponseJson
1313
import com.x8bit.bitwarden.data.autofill.fido2.datasource.network.service.DigitalAssetLinkService
1414
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2AttestationResponse
15+
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2CreateCredentialRequest
1516
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2CredentialAssertionRequest
1617
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2CredentialAssertionResult
17-
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2CreateCredentialRequest
1818
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2PublicKeyCredential
1919
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2RegisterCredentialResult
2020
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2ValidateOriginResult

app/src/test/java/com/x8bit/bitwarden/data/autofill/fido2/util/Fido2IntentUtilsTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ import androidx.credentials.provider.CallingAppInfo
1414
import androidx.credentials.provider.PendingIntentHandler
1515
import androidx.credentials.provider.ProviderCreateCredentialRequest
1616
import androidx.credentials.provider.ProviderGetCredentialRequest
17-
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2CredentialAssertionRequest
1817
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2CreateCredentialRequest
18+
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2CredentialAssertionRequest
1919
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2GetCredentialsRequest
2020
import com.x8bit.bitwarden.data.platform.util.isBuildVersionBelow
2121
import com.x8bit.bitwarden.ui.platform.manager.intent.EXTRA_KEY_CIPHER_ID

app/src/test/java/com/x8bit/bitwarden/data/platform/manager/SpecialCircumstanceManagerTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ class SpecialCircumstanceManagerTest {
5555

5656
specialCircumstanceManager.specialCircumstance = preLoginSpecialCircumstance
5757
assertEquals(preLoginSpecialCircumstance, awaitItem())
58-
val mockUserAccount = mockk<UserState.Account>() {
58+
val mockUserAccount = mockk<UserState.Account> {
5959
every { isLoggedIn } returns true
6060
}
6161
val mockUserState = mockk<UserState> {
@@ -76,7 +76,7 @@ class SpecialCircumstanceManagerTest {
7676

7777
specialCircumstanceManager.specialCircumstance = SpecialCircumstance.VaultShortcut
7878
assertEquals(SpecialCircumstance.VaultShortcut, awaitItem())
79-
val mockUserAccount = mockk<UserState.Account>() {
79+
val mockUserAccount = mockk<UserState.Account> {
8080
every { isLoggedIn } returns true
8181
}
8282
val mockUserState = mockk<UserState> {

app/src/test/java/com/x8bit/bitwarden/data/util/StringExtensionsTest.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,6 @@ class StringExtensionsTest {
186186

187187
@Test
188188
fun `hasPort returns true when port is present`() {
189-
val uriString = "www.google.com:8080"
190189
assertTrue("www.google.com:8080".hasPort())
191190
}
192191

app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/completeregistration/CompleteRegistrationViewModelTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ class CompleteRegistrationViewModelTest : BaseViewModelTest() {
5555
* after the user has entered all valid inputs.
5656
*/
5757
private val mutableUserStateFlow = MutableStateFlow<UserState?>(null)
58-
private val mockAuthRepository = mockk<AuthRepository>() {
58+
private val mockAuthRepository = mockk<AuthRepository> {
5959
every { userStateFlow } returns mutableUserStateFlow
6060
coEvery {
6161
login(

app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/enterprisesignon/EnterpriseSignOnViewModelTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ class EnterpriseSignOnViewModelTest : BaseViewModelTest() {
5959

6060
private val generatorRepository: GeneratorRepository = FakeGeneratorRepository()
6161

62-
private val featureFlagManager = mockk<FeatureFlagManager>() {
62+
private val featureFlagManager = mockk<FeatureFlagManager> {
6363
every {
6464
getFeatureFlag(FlagKey.VerifiedSsoDomainEndpoint)
6565
} returns false

app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/send/SendViewModelTest.kt

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -375,22 +375,22 @@ class SendViewModelTest : BaseViewModelTest() {
375375
@Test
376376
fun `VaultRepository SendData NoNetwork should update view state to Empty when there is no data`() =
377377
runTest {
378-
val dialogState = SendState.DialogState.Loading(R.string.syncing.asText())
379-
val viewModel = createViewModel(state = DEFAULT_STATE.copy(dialogState = dialogState))
378+
val dialogState = SendState.DialogState.Loading(R.string.syncing.asText())
379+
val viewModel = createViewModel(state = DEFAULT_STATE.copy(dialogState = dialogState))
380380

381-
viewModel.eventFlow.test {
382-
mutableSendDataFlow.value = DataState.NoNetwork()
383-
}
381+
viewModel.eventFlow.test {
382+
mutableSendDataFlow.value = DataState.NoNetwork()
383+
}
384384

385-
assertEquals(
386-
DEFAULT_STATE.copy(
387-
viewState = SendState.ViewState.Empty,
388-
dialogState = null,
389-
isRefreshing = false,
390-
),
391-
viewModel.stateFlow.value,
392-
)
393-
}
385+
assertEquals(
386+
DEFAULT_STATE.copy(
387+
viewState = SendState.ViewState.Empty,
388+
dialogState = null,
389+
isRefreshing = false,
390+
),
391+
viewModel.stateFlow.value,
392+
)
393+
}
394394

395395
@Test
396396
fun `VaultRepository SendData Pending should update view state`() {

app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/AddSendViewModelTest.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1054,7 +1054,8 @@ class AddSendViewModelTest : BaseViewModelTest() {
10541054
dialogState = AddSendState.DialogState.Error(
10551055
title = R.string.internet_connection_required_title.asText(),
10561056
message = R.string.internet_connection_required_message.asText(),
1057-
)),
1057+
),
1058+
),
10581059
viewModel.stateFlow.value,
10591060
)
10601061

app/src/test/java/com/x8bit/bitwarden/ui/util/ComposeTestHelpers.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ fun SemanticsNodeInteraction.performCustomAccessibilityAction(label: String) {
169169
?: throw AssertionError(
170170
"""
171171
No action with label $label
172-
172+
173173
Available actions: $customActions
174174
in
175175
$tree

0 commit comments

Comments
 (0)