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

Merge branch 'develop' into feature/bma/sxcludePreviewFromCodeCoverage

Browse source
This commit is contained in:
Benoit Marty 2024-01-11 16:02:58 +01:00 • committed by GitHub
commit 92d8e4f55b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
952 changed files with 1476 additions and 2027 deletions
Download patch file Download diff file Expand all files Collapse all files

2
features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/DefaultLogoutEntryPoint.kt
View file

@ -31,7 +31,6 @@ class DefaultLogoutEntryPoint @Inject constructor() : LogoutEntryPoint {
val plugins = ArrayList<Plugin>()
return object : LogoutEntryPoint.NodeBuilder {
override fun callback(callback: LogoutEntryPoint.Callback): LogoutEntryPoint.NodeBuilder {
plugins += callback
return this
@ -43,4 +42,3 @@ class DefaultLogoutEntryPoint @Inject constructor() : LogoutEntryPoint {
}
}
}

1
features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/LogoutNode.kt
View file

@ -38,7 +38,6 @@ class LogoutNode @AssistedInject constructor(
@Assisted plugins: List<Plugin>,
private val presenter: LogoutPresenter,
) : Node(buildContext, plugins = plugins) {
private fun onChangeRecoveryKeyClicked() {
plugins<LogoutEntryPoint.Callback>().forEach { it.onChangeRecoveryKeyClicked() }
}

3
features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/LogoutPresenter.kt
View file

@ -25,8 +25,8 @@ import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.runtime.setValue
import io.element.android.libraries.architecture.AsyncData
import io.element.android.libraries.architecture.AsyncAction
import io.element.android.libraries.architecture.AsyncData
import io.element.android.libraries.architecture.Presenter
import io.element.android.libraries.architecture.runCatchingUpdatingState
import io.element.android.libraries.core.bool.orTrue
@ -47,7 +47,6 @@ class LogoutPresenter @Inject constructor(
private val encryptionService: EncryptionService,
private val featureFlagService: FeatureFlagService,
) : Presenter<LogoutState> {
@Composable
override fun present(): LogoutState {
val localCoroutineScope = rememberCoroutineScope()

3
features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/ui/LogoutActionDialog.kt
View file

@ -30,7 +30,8 @@ fun LogoutActionDialog(
state: AsyncAction<String?>,
onConfirmClicked: () -> Unit,
onForceLogoutClicked: () -> Unit,
onDismissError: () -> Unit, // TODO Rename
// TODO Rename
onDismissError: () -> Unit,
onSuccessLogout: (String?) -> Unit,
) {
when (state) {

2
features/logout/impl/src/test/kotlin/io/element/android/features/logout/impl/LogoutPresenterTest.kt
View file

@ -40,7 +40,6 @@ import org.junit.Rule
import org.junit.Test
class LogoutPresenterTest {
@get:Rule
val warmUpRule = WarmUpRule()
@ -213,4 +212,3 @@ class LogoutPresenterTest {
featureFlagService = FakeFeatureFlagService(mapOf(FeatureFlags.SecureStorage.key to true)),
)
}

1
features/logout/impl/src/test/kotlin/io/element/android/features/logout/impl/LogoutViewTest.kt
View file

@ -36,7 +36,6 @@ import org.junit.runner.RunWith
@RunWith(AndroidJUnit4::class)
class LogoutViewTest {
@get:Rule val rule = createAndroidComposeRule<ComponentActivity>()
@Test

2
features/logout/impl/src/test/kotlin/io/element/android/features/logout/impl/direct/DefaultDirectLogoutPresenterTest.kt
View file

@ -38,7 +38,6 @@ import org.junit.Rule
import org.junit.Test
class DefaultDirectLogoutPresenterTest {
@get:Rule
val warmUpRule = WarmUpRule()
@ -194,4 +193,3 @@ class DefaultDirectLogoutPresenterTest {
featureFlagService = FakeFeatureFlagService(mapOf(FeatureFlags.SecureStorage.key to true)),
)
}