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

Fixes after rebase

Browse source
This commit is contained in:
Jorge Martín 2025-09-01 17:11:38 +02:00
parent ddf9e5055e
commit e8328858ab
117 changed files with 310 additions and 295 deletions
Download patch file Download diff file Expand all files Collapse all files

2
features/login/impl/src/main/kotlin/io/element/android/features/login/impl/DefaultLoginEntryPoint.kt
View file

@ -18,7 +18,7 @@ import io.element.android.libraries.architecture.createNode
@ContributesBinding(AppScope::class)
@Inject
class DefaultLoginEntryPoint() : LoginEntryPoint {
class DefaultLoginEntryPoint : LoginEntryPoint {
override fun nodeBuilder(parentNode: Node, buildContext: BuildContext): LoginEntryPoint.NodeBuilder {
val plugins = ArrayList<Plugin>()

2
features/login/impl/src/main/kotlin/io/element/android/features/login/impl/DefaultLoginIntentResolver.kt
View file

@ -16,7 +16,7 @@ import io.element.android.features.login.api.LoginParams
@ContributesBinding(AppScope::class)
@Inject
class DefaultLoginIntentResolver() : LoginIntentResolver {
class DefaultLoginIntentResolver : LoginIntentResolver {
override fun parse(uriString: String): LoginParams? {
val uri = uriString.toUri()
if (uri.host != "mobile.element.io") return null

0
features/login/impl/src/main/kotlin/io/element/android/features/login/impl/DefaultLoginUserStory.kt
View file

1
features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/loginpassword/LoginPasswordPresenter.kt
View file

@ -16,7 +16,6 @@ import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.runtime.saveable.rememberSaveable
import dev.zacsweers.metro.Inject
import io.element.android.features.login.impl.DefaultLoginUserStory
import io.element.android.features.login.impl.accountprovider.AccountProviderDataSource
import io.element.android.libraries.architecture.AsyncData
import io.element.android.libraries.architecture.Presenter

11
features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingLogoResIdProvider.kt
View file

@ -9,17 +9,18 @@ package io.element.android.features.login.impl.screens.onboarding
import android.annotation.SuppressLint
import android.content.Context
import com.squareup.anvil.annotations.ContributesBinding
import io.element.android.libraries.di.AppScope
import io.element.android.libraries.di.ApplicationContext
import javax.inject.Inject
import dev.zacsweers.metro.AppScope
import dev.zacsweers.metro.ContributesBinding
import dev.zacsweers.metro.Inject
import io.element.android.libraries.di.annotations.ApplicationContext
fun interface OnBoardingLogoResIdProvider {
fun get(): Int?
}
@ContributesBinding(AppScope::class)
class DefaultOnBoardingLogoResIdProvider @Inject constructor(
@Inject
class DefaultOnBoardingLogoResIdProvider(
@ApplicationContext private val context: Context,
) : OnBoardingLogoResIdProvider {
@SuppressLint("DiscouragedApi")

0
features/login/impl/src/test/kotlin/io/element/android/features/login/impl/di/FakeMergedQrCodeLoginComponent.kt
View file

11
features/login/impl/src/test/kotlin/io/element/android/features/login/impl/di/FakeQrCodeLoginGraph.kt
View file

@ -10,11 +10,10 @@ package io.element.android.features.login.impl.di
import com.bumble.appyx.core.modality.BuildContext
import com.bumble.appyx.core.node.Node
import com.bumble.appyx.core.plugin.Plugin
import io.element.android.features.login.impl.qrcode.FakeQrCodeLoginManager
import io.element.android.features.login.impl.qrcode.QrCodeLoginFlowNode
import io.element.android.features.login.impl.qrcode.QrCodeLoginManager
import io.element.android.libraries.architecture.AssistedNodeFactory
import io.element.android.libraries.architecture.createNode
import kotlin.reflect.KClass
internal class FakeQrCodeLoginGraph(
private val qrCodeLoginManager: QrCodeLoginManager,
@ -23,7 +22,7 @@ internal class FakeQrCodeLoginGraph(
return mapOf(
QrCodeLoginFlowNode::class to object : AssistedNodeFactory<QrCodeLoginFlowNode> {
override fun create(buildContext: BuildContext, plugins: List<Plugin>): QrCodeLoginFlowNode {
return createNode<QrCodeLoginFlowNode>(buildContext, plugins)
error("This factory should not be called in tests")
}
}
)
@ -33,9 +32,9 @@ internal class FakeQrCodeLoginGraph(
internal class Builder(
private val qrCodeLoginManager: QrCodeLoginManager,
) : QrCodeLoginComponent.Factory {
override fun create(): QrCodeLoginComponent {
return FakeQrCodeLoginComponent(qrCodeLoginManager)
) : QrCodeLoginGraph.Factory {
override fun create(): QrCodeLoginGraph {
return FakeQrCodeLoginGraph(qrCodeLoginManager)
}
}
}