From 2a0f63625045e37d90459686293b1b703c3c74aa Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Fri, 10 Feb 2023 14:57:50 +0100 Subject: [PATCH] Remove dead code --- .../kotlin/io/element/android/x/root/RootPresenter.kt | 8 -------- .../kotlin/io/element/android/x/root/RootState.kt | 3 --- .../io/element/android/x/root/RootPresenterTest.kt | 11 +---------- 3 files changed, 1 insertion(+), 21 deletions(-) diff --git a/app/src/main/kotlin/io/element/android/x/root/RootPresenter.kt b/app/src/main/kotlin/io/element/android/x/root/RootPresenter.kt index 63881df5ae..05457e463e 100644 --- a/app/src/main/kotlin/io/element/android/x/root/RootPresenter.kt +++ b/app/src/main/kotlin/io/element/android/x/root/RootPresenter.kt @@ -19,29 +19,23 @@ package io.element.android.x.root import androidx.compose.runtime.Composable import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.saveable.rememberSaveable -import io.element.android.features.rageshake.bugreport.BugReportPresenter import io.element.android.features.rageshake.crash.ui.CrashDetectionPresenter import io.element.android.features.rageshake.detection.RageshakeDetectionPresenter import io.element.android.libraries.architecture.Presenter import javax.inject.Inject class RootPresenter @Inject constructor( - private val bugReportPresenter: BugReportPresenter, private val crashDetectionPresenter: CrashDetectionPresenter, private val rageshakeDetectionPresenter: RageshakeDetectionPresenter, ) : Presenter { @Composable override fun present(): RootState { - val isBugReportVisible = rememberSaveable { - mutableStateOf(false) - } val isShowkaseButtonVisible = rememberSaveable { mutableStateOf(true) } val rageshakeDetectionState = rageshakeDetectionPresenter.present() val crashDetectionState = crashDetectionPresenter.present() - val bugReportState = bugReportPresenter.present() fun handleEvent(event: RootEvents) { when (event) { @@ -50,11 +44,9 @@ class RootPresenter @Inject constructor( } return RootState( - isBugReportVisible = isBugReportVisible.value, isShowkaseButtonVisible = isShowkaseButtonVisible.value, rageshakeDetectionState = rageshakeDetectionState, crashDetectionState = crashDetectionState, - bugReportState = bugReportState, eventSink = ::handleEvent ) } diff --git a/app/src/main/kotlin/io/element/android/x/root/RootState.kt b/app/src/main/kotlin/io/element/android/x/root/RootState.kt index 6d516c5c70..4f6b4c2062 100644 --- a/app/src/main/kotlin/io/element/android/x/root/RootState.kt +++ b/app/src/main/kotlin/io/element/android/x/root/RootState.kt @@ -17,16 +17,13 @@ package io.element.android.x.root import androidx.compose.runtime.Stable -import io.element.android.features.rageshake.bugreport.BugReportState import io.element.android.features.rageshake.crash.ui.CrashDetectionState import io.element.android.features.rageshake.detection.RageshakeDetectionState @Stable data class RootState( - val isBugReportVisible: Boolean, val isShowkaseButtonVisible: Boolean, val rageshakeDetectionState: RageshakeDetectionState, val crashDetectionState: CrashDetectionState, - val bugReportState: BugReportState, val eventSink: (RootEvents) -> Unit ) diff --git a/app/src/test/kotlin/io/element/android/x/root/RootPresenterTest.kt b/app/src/test/kotlin/io/element/android/x/root/RootPresenterTest.kt index 3f5a18d567..0e3c6ce866 100644 --- a/app/src/test/kotlin/io/element/android/x/root/RootPresenterTest.kt +++ b/app/src/test/kotlin/io/element/android/x/root/RootPresenterTest.kt @@ -22,12 +22,10 @@ import app.cash.molecule.RecompositionClock import app.cash.molecule.moleculeFlow import app.cash.turbine.test import com.google.common.truth.Truth.assertThat -import io.element.android.features.rageshake.bugreport.BugReportPresenter import io.element.android.features.rageshake.crash.ui.CrashDetectionPresenter import io.element.android.features.rageshake.detection.RageshakeDetectionPresenter import io.element.android.features.rageshake.preferences.RageshakePreferencesPresenter import kotlinx.coroutines.ExperimentalCoroutinesApi -import kotlinx.coroutines.test.TestScope import kotlinx.coroutines.test.runTest import org.junit.Test @@ -58,17 +56,11 @@ class RootPresenterTest { } } - private fun TestScope.createPresenter(): RootPresenter { + private fun createPresenter(): RootPresenter { val crashDataStore = FakeCrashDataStore() val rageshakeDataStore = FakeRageshakeDataStore() val rageshake = FakeRageShake() val screenshotHolder = FakeScreenshotHolder() - val bugReportPresenter = BugReportPresenter( - bugReporter = FakeBugReporter(), - crashDataStore = crashDataStore, - screenshotHolder = screenshotHolder, - appCoroutineScope = this, - ) val crashDetectionPresenter = CrashDetectionPresenter( crashDataStore = crashDataStore ) @@ -81,7 +73,6 @@ class RootPresenterTest { ) ) return RootPresenter( - bugReportPresenter = bugReportPresenter, crashDetectionPresenter = crashDetectionPresenter, rageshakeDetectionPresenter = rageshakeDetectionPresenter, )