Skip to content

Commit d27ab1d

Browse files
Apply formatter to the entire app (#4698)
1 parent a1a3d55 commit d27ab1d

File tree

24 files changed

+51
-58
lines changed

24 files changed

+51
-58
lines changed

app/src/main/java/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryImpl.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1372,6 +1372,7 @@ class AuthRepositoryImpl(
13721372
// the notice needs to appear again
13731373
NewDeviceNoticeDisplayStatus.HAS_SEEN ->
13741374
newDeviceNoticeState.shouldDisplayNoticeIfSeen
1375+
13751376
NewDeviceNoticeDisplayStatus.HAS_NOT_SEEN -> true
13761377
// the user never needs to see the notice again
13771378
NewDeviceNoticeDisplayStatus.CAN_ACCESS_EMAIL_PERMANENT -> false
@@ -1592,6 +1593,7 @@ class AuthRepositoryImpl(
15921593
configDiskSource.serverConfig?.isOfficialBitwardenServer == false -> {
15931594
LoginResult.UnofficialServerError
15941595
}
1596+
15951597
else -> LoginResult.Error(errorMessage = null)
15961598
}
15971599
},

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import com.x8bit.bitwarden.data.vault.datasource.sdk.util.toAndroidAttestationRe
2424
import com.x8bit.bitwarden.data.vault.datasource.sdk.util.toAndroidFido2PublicKeyCredential
2525
import com.x8bit.bitwarden.ui.platform.base.util.toHostOrPathOrNull
2626
import kotlinx.serialization.SerializationException
27-
import kotlinx.serialization.encodeToString
2827
import kotlinx.serialization.json.Json
2928

3029
/**

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import com.x8bit.bitwarden.data.platform.repository.util.bufferedMutableSharedFl
66
import com.x8bit.bitwarden.data.platform.util.decodeFromStringOrNull
77
import kotlinx.coroutines.flow.Flow
88
import kotlinx.coroutines.flow.onSubscription
9-
import kotlinx.serialization.encodeToString
109
import kotlinx.serialization.json.Json
1110

1211
private const val SERVER_CONFIGURATIONS = "serverConfigurations"

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import com.x8bit.bitwarden.data.platform.repository.util.bufferedMutableSharedFl
66
import com.x8bit.bitwarden.data.platform.util.decodeFromStringOrNull
77
import kotlinx.coroutines.flow.Flow
88
import kotlinx.coroutines.flow.onSubscription
9-
import kotlinx.serialization.encodeToString
109
import kotlinx.serialization.json.Json
1110

1211
private const val PRE_AUTH_URLS_KEY = "preAuthEnvironmentUrls"

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import com.x8bit.bitwarden.data.platform.datasource.network.model.OrganizationEv
66
import com.x8bit.bitwarden.data.platform.manager.dispatcher.DispatcherManager
77
import com.x8bit.bitwarden.data.platform.manager.model.OrganizationEventType
88
import kotlinx.coroutines.withContext
9-
import kotlinx.serialization.encodeToString
109
import kotlinx.serialization.json.Json
1110

1211
/**

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -394,8 +394,8 @@ interface SettingsDiskSource {
394394
fun getShouldShowGeneratorCoachMarkFlow(): Flow<Boolean?>
395395

396396
/**
397-
* Stores the given [screenData] as the screen to resume to identified by [userId].
398-
*/
397+
* Stores the given [screenData] as the screen to resume to identified by [userId].
398+
*/
399399
fun storeAppResumeScreen(userId: String, screenData: AppResumeScreenData?)
400400

401401
/**

app/src/main/java/com/x8bit/bitwarden/data/tiles/BitwardenGeneratorTileService.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage
88
import com.x8bit.bitwarden.data.platform.util.isBuildVersionBelow
99
import com.x8bit.bitwarden.ui.platform.manager.intent.IntentManager
1010
import dagger.hilt.android.AndroidEntryPoint
11-
import kotlinx.coroutines.Runnable
1211
import javax.inject.Inject
1312

1413
/**

app/src/main/java/com/x8bit/bitwarden/data/tiles/BitwardenVaultTileService.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage
88
import com.x8bit.bitwarden.data.platform.util.isBuildVersionBelow
99
import com.x8bit.bitwarden.ui.platform.manager.intent.IntentManager
1010
import dagger.hilt.android.AndroidEntryPoint
11-
import kotlinx.coroutines.Runnable
1211
import javax.inject.Inject
1312

1413
/**

app/src/main/java/com/x8bit/bitwarden/data/tools/generator/datasource/disk/GeneratorDiskSourceImpl.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import com.x8bit.bitwarden.data.platform.datasource.disk.BaseDiskSource
55
import com.x8bit.bitwarden.data.platform.util.decodeFromStringOrNull
66
import com.x8bit.bitwarden.data.tools.generator.repository.model.PasscodeGenerationOptions
77
import com.x8bit.bitwarden.data.tools.generator.repository.model.UsernameGenerationOptions
8-
import kotlinx.serialization.encodeToString
98
import kotlinx.serialization.json.Json
109

1110
private const val PASSWORD_GENERATION_OPTIONS_KEY = "passwordGenerationOptions"

app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/disk/VaultDiskSourceImpl.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import kotlinx.coroutines.flow.map
2323
import kotlinx.coroutines.flow.merge
2424
import kotlinx.coroutines.launch
2525
import kotlinx.coroutines.withContext
26-
import kotlinx.serialization.encodeToString
2726
import kotlinx.serialization.json.Json
2827
import timber.log.Timber
2928

app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/sdk/VaultSdkSourceImpl.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ import com.bitwarden.fido.Fido2CredentialAutofillView
1313
import com.bitwarden.fido.PublicKeyCredentialAuthenticatorAssertionResponse
1414
import com.bitwarden.fido.PublicKeyCredentialAuthenticatorAttestationResponse
1515
import com.bitwarden.sdk.BitwardenException
16-
import com.bitwarden.sdk.VaultClient
1716
import com.bitwarden.sdk.Fido2CredentialStore
17+
import com.bitwarden.sdk.VaultClient
1818
import com.bitwarden.send.Send
1919
import com.bitwarden.send.SendView
2020
import com.bitwarden.vault.Attachment

app/src/main/java/com/x8bit/bitwarden/ui/platform/components/coachmark/CoachMarkScope.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package com.x8bit.bitwarden.ui.platform.components.coachmark
33
import androidx.compose.foundation.layout.BoxScope
44
import androidx.compose.foundation.layout.RowScope
55
import androidx.compose.foundation.lazy.LazyListScope
6-
import androidx.compose.foundation.lazy.items
76
import androidx.compose.runtime.Composable
87
import androidx.compose.ui.Modifier
98
import com.x8bit.bitwarden.ui.platform.base.util.Text

app/src/main/java/com/x8bit/bitwarden/ui/platform/components/coachmark/CoachMarkScopeInstance.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import androidx.compose.ui.semantics.SemanticsPropertyReceiver
2424
import androidx.compose.ui.semantics.semantics
2525
import androidx.compose.ui.unit.Dp
2626
import androidx.compose.ui.unit.dp
27-
import com.x8bit.bitwarden.R
2827
import com.x8bit.bitwarden.ui.platform.base.util.Text
2928
import com.x8bit.bitwarden.ui.platform.base.util.toListItemCardStyle
3029
import com.x8bit.bitwarden.ui.platform.components.coachmark.model.CoachMarkHighlightShape

app/src/main/java/com/x8bit/bitwarden/ui/platform/components/dialog/BitwardenLoadingDialog.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import androidx.compose.runtime.Composable
66
import androidx.compose.ui.ExperimentalComposeUiApi
77
import androidx.compose.ui.Modifier
88
import androidx.compose.ui.semantics.semantics
9-
import androidx.compose.ui.semantics.testTagsAsResourceId
109
import androidx.compose.ui.semantics.testTag
10+
import androidx.compose.ui.semantics.testTagsAsResourceId
1111
import androidx.compose.ui.tooling.preview.Preview
1212
import androidx.compose.ui.window.Popup
1313
import androidx.compose.ui.window.PopupProperties

app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/sdk/AuthSdkSourceTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import com.bitwarden.core.RegisterKeyResponse
88
import com.bitwarden.core.RegisterTdeKeyResponse
99
import com.bitwarden.crypto.HashPurpose
1010
import com.bitwarden.crypto.Kdf
11-
import com.bitwarden.sdk.Client
1211
import com.bitwarden.sdk.AuthClient
12+
import com.bitwarden.sdk.Client
1313
import com.bitwarden.sdk.PlatformClient
1414
import com.x8bit.bitwarden.data.auth.datasource.sdk.model.PasswordStrength
1515
import com.x8bit.bitwarden.data.platform.manager.SdkClientManager

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ import io.mockk.slot
3737
import io.mockk.unmockkStatic
3838
import kotlinx.coroutines.test.runTest
3939
import kotlinx.serialization.SerializationException
40-
import kotlinx.serialization.encodeToString
4140
import kotlinx.serialization.json.Json
4241
import org.junit.jupiter.api.AfterEach
4342
import org.junit.jupiter.api.Assertions.assertEquals

app/src/test/java/com/x8bit/bitwarden/data/platform/datasource/disk/EnvironmentDiskSourceTest.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import com.x8bit.bitwarden.data.auth.datasource.disk.model.EnvironmentUrlDataJso
66
import com.x8bit.bitwarden.data.platform.base.FakeSharedPreferences
77
import com.x8bit.bitwarden.data.platform.repository.model.Environment
88
import kotlinx.coroutines.test.runTest
9-
import kotlinx.serialization.encodeToString
109
import kotlinx.serialization.json.Json
1110
import kotlinx.serialization.json.encodeToJsonElement
1211
import org.junit.jupiter.api.Assertions.assertEquals

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -349,13 +349,13 @@ class FirstTimeActionManagerTest {
349349
fun `shouldShowGeneratorCoachMarkFlow updates when onboarding feature value changes`() =
350350
runTest {
351351
firstTimeActionManager.shouldShowGeneratorCoachMarkFlow.test {
352-
// Null will be mapped to false
352+
// Null will be mapped to false
353353
assertFalse(awaitItem())
354354
mutableOnboardingFeatureFlow.update { true }
355-
// Take the value from disk.
355+
// Take the value from disk.
356356
assertTrue(awaitItem())
357+
}
357358
}
358-
}
359359

360360
@Suppress("MaxLineLength")
361361
@Test

app/src/test/java/com/x8bit/bitwarden/data/tools/generator/datasource/disk/GeneratorDiskSourceTest.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import androidx.core.content.edit
44
import com.x8bit.bitwarden.data.platform.base.FakeSharedPreferences
55
import com.x8bit.bitwarden.data.tools.generator.repository.model.PasscodeGenerationOptions
66
import com.x8bit.bitwarden.data.tools.generator.repository.model.UsernameGenerationOptions
7-
import kotlinx.serialization.encodeToString
87
import kotlinx.serialization.json.Json
98
import org.junit.jupiter.api.Assertions.assertEquals
109
import org.junit.jupiter.api.Assertions.assertNotNull

app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/sdk/VaultSdkSourceTest.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,20 @@ import com.bitwarden.fido.Origin
1515
import com.bitwarden.fido.PublicKeyCredentialAuthenticatorAssertionResponse
1616
import com.bitwarden.fido.PublicKeyCredentialAuthenticatorAttestationResponse
1717
import com.bitwarden.fido.UnverifiedAssetLink
18+
import com.bitwarden.sdk.AuthClient
1819
import com.bitwarden.sdk.BitwardenException
1920
import com.bitwarden.sdk.Client
20-
import com.bitwarden.sdk.AuthClient
2121
import com.bitwarden.sdk.ClientCiphers
22-
import com.bitwarden.sdk.CryptoClient
23-
import com.bitwarden.sdk.ExporterClient
2422
import com.bitwarden.sdk.ClientFido2
2523
import com.bitwarden.sdk.ClientFido2Authenticator
2624
import com.bitwarden.sdk.ClientFido2Client
2725
import com.bitwarden.sdk.ClientPasswordHistory
26+
import com.bitwarden.sdk.CryptoClient
27+
import com.bitwarden.sdk.ExporterClient
28+
import com.bitwarden.sdk.Fido2CredentialStore
2829
import com.bitwarden.sdk.PlatformClient
2930
import com.bitwarden.sdk.SendClient
3031
import com.bitwarden.sdk.VaultClient
31-
import com.bitwarden.sdk.Fido2CredentialStore
3232
import com.bitwarden.send.Send
3333
import com.bitwarden.send.SendView
3434
import com.bitwarden.vault.Attachment

app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/newdevicenotice/NewDeviceNoticeEmailAccessViewModelTest.kt

Lines changed: 30 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -99,40 +99,43 @@ class NewDeviceNoticeEmailAccessViewModelTest : BaseViewModelTest() {
9999

100100
@Test
101101
@Suppress("MaxLineLength")
102-
fun `ContinueClick should emit NavigateBackToVault if isEmailAccessEnabled and NewDevicePermanentDismiss flag is off`() = runTest {
103-
every { featureFlagManager.getFeatureFlag(FlagKey.NewDevicePermanentDismiss) } returns false
102+
fun `ContinueClick should emit NavigateBackToVault if isEmailAccessEnabled and NewDevicePermanentDismiss flag is off`() =
103+
runTest {
104+
every {
105+
featureFlagManager.getFeatureFlag(FlagKey.NewDevicePermanentDismiss)
106+
} returns false
104107

105-
val viewModel = createViewModel()
106-
viewModel.trySendAction(NewDeviceNoticeEmailAccessAction.EmailAccessToggle(true))
107-
viewModel.eventFlow.test {
108-
viewModel.trySendAction(NewDeviceNoticeEmailAccessAction.ContinueClick)
109-
assertEquals(
110-
NewDeviceNoticeEmailAccessEvent.NavigateBackToVault,
111-
awaitItem(),
112-
)
113-
verify(exactly = 1) {
114-
authRepository.setNewDeviceNoticeState(
115-
NewDeviceNoticeState(
116-
displayStatus = NewDeviceNoticeDisplayStatus.CAN_ACCESS_EMAIL,
117-
lastSeenDate = null,
118-
),
108+
val viewModel = createViewModel()
109+
viewModel.trySendAction(NewDeviceNoticeEmailAccessAction.EmailAccessToggle(true))
110+
viewModel.eventFlow.test {
111+
viewModel.trySendAction(NewDeviceNoticeEmailAccessAction.ContinueClick)
112+
assertEquals(
113+
NewDeviceNoticeEmailAccessEvent.NavigateBackToVault,
114+
awaitItem(),
119115
)
116+
verify(exactly = 1) {
117+
authRepository.setNewDeviceNoticeState(
118+
NewDeviceNoticeState(
119+
displayStatus = NewDeviceNoticeDisplayStatus.CAN_ACCESS_EMAIL,
120+
lastSeenDate = null,
121+
),
122+
)
123+
}
120124
}
121125
}
122-
}
123126

124127
@Test
125-
@Suppress("MaxLineLength")
126-
fun `ContinueClick should emit NavigateToTwoFactorOptions if isEmailAccessEnabled is false`() = runTest {
127-
val viewModel = createViewModel()
128-
viewModel.eventFlow.test {
129-
viewModel.trySendAction(NewDeviceNoticeEmailAccessAction.ContinueClick)
130-
assertEquals(
131-
NewDeviceNoticeEmailAccessEvent.NavigateToTwoFactorOptions,
132-
awaitItem(),
133-
)
128+
fun `ContinueClick should emit NavigateToTwoFactorOptions if isEmailAccessEnabled is false`() =
129+
runTest {
130+
val viewModel = createViewModel()
131+
viewModel.eventFlow.test {
132+
viewModel.trySendAction(NewDeviceNoticeEmailAccessAction.ContinueClick)
133+
assertEquals(
134+
NewDeviceNoticeEmailAccessEvent.NavigateToTwoFactorOptions,
135+
awaitItem(),
136+
)
137+
}
134138
}
135-
}
136139

137140
@Test
138141
fun `LearnMoreClick should emit NavigateToLearnMore`() =

app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/vaultunlockednavbar/VaultUnlockedNavBarViewModelTest.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,7 @@ class VaultUnlockedNavBarViewModelTest : BaseViewModelTest() {
248248
viewModel.stateFlow.value,
249249
)
250250
}
251+
251252
@Suppress("MaxLineLength")
252253
@Test
253254
fun `on init with SendShortcut special circumstance should navigate to the send screen with shortcut event`() =

app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/generator/GeneratorViewModelTest.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2258,15 +2258,15 @@ class GeneratorViewModelTest : BaseViewModelTest() {
22582258
@Test
22592259
fun `StartExploreGeneratorTour action calls first time action manager markCoachMarkTourCompleted called and show coach mark event sent`() =
22602260
runTest {
2261-
val viewModel = createViewModel()
2261+
val viewModel = createViewModel()
22622262
viewModel.eventFlow.test {
22632263
viewModel.trySendAction(GeneratorAction.StartExploreGeneratorTour)
22642264
assertEquals(GeneratorEvent.StartCoachMarkTour, awaitItem())
22652265
}
2266-
verify(exactly = 1) {
2267-
firstTimeActionManager.markCoachMarkTourCompleted(CoachMarkTourType.GENERATOR)
2266+
verify(exactly = 1) {
2267+
firstTimeActionManager.markCoachMarkTourCompleted(CoachMarkTourType.GENERATOR)
2268+
}
22682269
}
2269-
}
22702270
//region Helper Functions
22712271

22722272
@Suppress("LongParameterList")

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ fun ComposeContentTestRule.assertNoDialogExists() {
6565
}
6666

6767
/**
68-
* Asserts that no popup currently exists.
69-
*/
68+
* Asserts that no popup currently exists.
69+
*/
7070
fun ComposeContentTestRule.assertNoPopupExists() {
7171
this
7272
.onNode(isPopup())

0 commit comments

Comments
 (0)