Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Fix quality and failing test.

Browse source
This commit is contained in:
Benoit Marty 2024-09-16 14:23:56 +02:00 • committed by Benoit Marty
parent 0e9c0450d9
commit e209c30c06
3 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderView.kt
View file

@ -118,7 +118,8 @@ fun ConfirmAccountProviderView(
}, },
onDismiss = { onDismiss = {
eventSink(ConfirmAccountProviderEvents.ClearError) eventSink(ConfirmAccountProviderEvents.ClearError)
}) }
)
} }
is AccountCreationNotSupported -> { is AccountCreationNotSupported -> {
ErrorDialog( ErrorDialog(

7
features/login/impl/src/main/kotlin/io/element/android/features/login/impl/web/WebClientUrlForAuthenticationRetriever.kt
View file

@ -14,8 +14,8 @@ import io.element.android.features.login.impl.resolver.network.WellknownAPI
import io.element.android.features.login.impl.screens.createaccount.AccountCreationNotSupported import io.element.android.features.login.impl.screens.createaccount.AccountCreationNotSupported
import io.element.android.libraries.di.AppScope import io.element.android.libraries.di.AppScope
import io.element.android.libraries.network.RetrofitFactory import io.element.android.libraries.network.RetrofitFactory
import java.net.HttpURLConnection
import timber.log.Timber import timber.log.Timber
import java.net.HttpURLConnection
import javax.inject.Inject import javax.inject.Inject
interface WebClientUrlForAuthenticationRetriever { interface WebClientUrlForAuthenticationRetriever {
@ -35,10 +35,9 @@ class DefaultWebClientUrlForAuthenticationRetriever @Inject constructor(
.create(WellknownAPI::class.java) .create(WellknownAPI::class.java)
val result = try { val result = try {
wellknownApi.getElementWellKnown() wellknownApi.getElementWellKnown()
} catch (e: Exception) { } catch (e: retrofit2.HttpException) {
throw when { throw when {
e is retrofit2.HttpException && e.code() == HttpURLConnection.HTTP_NOT_FOUND -> AccountCreationNotSupported()
e.code() == HttpURLConnection.HTTP_NOT_FOUND -> AccountCreationNotSupported()
else -> e else -> e
} }
} }

3
features/onboarding/impl/src/test/kotlin/io/element/android/features/onboarding/impl/OnBoardingPresenterTest.kt
View file

@ -11,6 +11,7 @@ import app.cash.molecule.RecompositionMode
import app.cash.molecule.moleculeFlow import app.cash.molecule.moleculeFlow
import app.cash.turbine.test import app.cash.turbine.test
import com.google.common.truth.Truth.assertThat import com.google.common.truth.Truth.assertThat
import io.element.android.appconfig.OnBoardingConfig
import io.element.android.libraries.core.meta.BuildType import io.element.android.libraries.core.meta.BuildType
import io.element.android.libraries.featureflag.api.FeatureFlags import io.element.android.libraries.featureflag.api.FeatureFlags
import io.element.android.libraries.featureflag.test.FakeFeatureFlagService import io.element.android.libraries.featureflag.test.FakeFeatureFlagService
@ -46,7 +47,7 @@ class OnBoardingPresenterTest {
assertThat(initialState.isDebugBuild).isTrue() assertThat(initialState.isDebugBuild).isTrue()
assertThat(initialState.canLoginWithQrCode).isFalse() assertThat(initialState.canLoginWithQrCode).isFalse()
assertThat(initialState.productionApplicationName).isEqualTo("B") assertThat(initialState.productionApplicationName).isEqualTo("B")
assertThat(initialState.canCreateAccount).isFalse() assertThat(initialState.canCreateAccount).isEqualTo(OnBoardingConfig.CAN_CREATE_ACCOUNT)
assertThat(awaitItem().canLoginWithQrCode).isTrue() assertThat(awaitItem().canLoginWithQrCode).isTrue()
} }