filippodb/SchildiChat-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

formatting

Browse Source
This commit is contained in:
Adam Brown 2022-02-25 18:13:52 +00:00
parent 716928d9d2
commit b5778bd6c5
6 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vector/src/debug/java/im/vector/app/features/debug/settings/OverrideDropdownView.kt
View File

@ -43,7 +43,7 @@ class OverrideDropdownView @JvmOverloads constructor(
optionsSpinner = findViewById(R.id.feature_options)
}
fun <T: OverrideOption> bind(feature: OverrideDropdown<T>, listener: Listener<T>) {
fun <T : OverrideOption> bind(feature: OverrideDropdown<T>, listener: Listener<T>) {
labelView.text = feature.label
optionsSpinner.apply {
@ -75,7 +75,7 @@ class OverrideDropdownView @JvmOverloads constructor(
fun onOverrideSelected(option: T?)
}
data class OverrideDropdown<T: OverrideOption>(
data class OverrideDropdown<T : OverrideOption>(
val label: String,
val options: List<T>,
val activeOption: T?,

6
vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt
View File

@ -768,7 +768,7 @@ class OnboardingViewModel @AssistedInject constructor(
when (isAccountCreated) {
true -> {
val homeServerCapabilities = session.getHomeServerCapabilities()
val capabilityOverrides = vectorOverrides.forceHomeserverCapabilities()?.firstOrNull()
val capabilityOverrides = vectorOverrides.forceHomeserverCapabilities?.firstOrNull()
val personalizationState = state.personalizationState.copy(
supportsChangingDisplayName = capabilityOverrides?.canChangeDisplayName ?: homeServerCapabilities.canChangeDisplayName,
supportsChangingProfilePicture = capabilityOverrides?.canChangeAvatar ?: homeServerCapabilities.canChangeAvatar
@ -934,7 +934,9 @@ class OnboardingViewModel @AssistedInject constructor(
when {
it.supportsChangingDisplayName -> _viewEvents.post(OnboardingViewEvents.OnChooseDisplayName)
it.supportsChangingProfilePicture -> _viewEvents.post(OnboardingViewEvents.OnChooseDisplayName)
else -> throw IllegalStateException("It should not be possible to personalize without supporting display name or avatar changing")
else -> {
throw IllegalStateException("It should not be possible to personalize without supporting display name or avatar changing")
}
}
}
}

1
vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthVariant.kt
View File

@ -424,5 +424,4 @@ class FtueAuthVariant(
option = commonOption
)
}
}

1
vector/src/test/java/im/vector/app/test/Extensions.kt
View File

@ -21,7 +21,6 @@ import im.vector.app.core.platform.VectorViewEvents
import im.vector.app.core.platform.VectorViewModel
import im.vector.app.core.platform.VectorViewModelAction
import kotlinx.coroutines.CoroutineScope
import org.hamcrest.Matcher
fun String.trimIndentOneLine() = trimIndent().replace("\n", "")

1
vector/src/test/java/im/vector/app/test/fakes/FakeAuthenticationService.kt
View File

@ -18,7 +18,6 @@ package im.vector.app.test.fakes
import io.mockk.coJustRun
import io.mockk.every
import io.mockk.justRun
import io.mockk.mockk
import org.matrix.android.sdk.api.auth.AuthenticationService
import org.matrix.android.sdk.api.auth.registration.RegistrationWizard

1
vector/src/test/java/im/vector/app/test/fakes/FakeVectorOverrides.kt
View File

@ -18,6 +18,5 @@ package im.vector.app.test.fakes
import im.vector.app.features.DefaultVectorOverrides
import im.vector.app.features.VectorOverrides
import io.mockk.mockk
class FakeVectorOverrides : VectorOverrides by DefaultVectorOverrides()