Upgrade SDK version to 25.02.26 (#4305)

* Upgrade SDK version to 25.02.26

* Remove OIDC URL result from logout, the SDK no longer provides it

* Handle room creation and destruction in a better way

* Remove `onSuccessLogout`

Author: jmartinesp

appnav/src/main/kotlin/io/element/android/appnav/room/joined/JoinedRoomLoadedFlowNode.kt

@@ -9,9 +9,7 @@ package io.element.android.appnav.room.joined
 
 import android.os.Parcelable
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.DisposableEffect
 import androidx.compose.ui.Modifier
-import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
 import com.bumble.appyx.core.lifecycle.subscribe
 import com.bumble.appyx.core.modality.BuildContext
@@ -56,7 +54,7 @@ class JoinedRoomLoadedFlowNode @AssistedInject constructor(
     roomComponentFactory: RoomComponentFactory,
 ) : BaseFlowNode<JoinedRoomLoadedFlowNode.NavTarget>(
     backstack = BackStack(
-        initialElement = when (val input = plugins.filterIsInstance(Inputs::class.java).first().initialElement) {
+        initialElement = when (val input = plugins.filterIsInstance<Inputs>().first().initialElement) {
             is RoomNavigationTarget.Messages -> NavTarget.Messages(input.focusedEventId)
             RoomNavigationTarget.Details -> NavTarget.RoomDetails
             RoomNavigationTarget.NotificationSettings -> NavTarget.RoomNotificationSettings
@@ -197,16 +195,6 @@ class JoinedRoomLoadedFlowNode @AssistedInject constructor(
 
     @Composable
     override fun View(modifier: Modifier) {
-        // Rely on the View Lifecycle in addition to the Node Lifecycle,
-        // because this node enters 'onDestroy' before his children, so it can leads to
-        // using the room in a child node where it's already closed.
-        DisposableEffect(Unit) {
-            onDispose {
-                if (lifecycle.currentState == Lifecycle.State.DESTROYED) {
-                    inputs.room.destroy()
-                }
-            }
-        }
         BackstackView()
     }
 }

appnav/src/test/kotlin/io/element/android/appnav/loggedin/LoggedInPresenterTest.kt

@@ -521,10 +521,9 @@ class LoggedInPresenterTest {
     @OptIn(ExperimentalCoroutinesApi::class)
     @Test
     fun `present - LogoutAndMigrateToNativeSlidingSync logs out the user`() = runTest {
-        val logoutLambda = lambdaRecorder<Boolean, Boolean, String?> { userInitiated, ignoreSdkError ->
+        val logoutLambda = lambdaRecorder<Boolean, Boolean, Unit> { userInitiated, ignoreSdkError ->
             assertThat(userInitiated).isTrue()
             assertThat(ignoreSdkError).isTrue()
-            null
         }
         val matrixClient = FakeMatrixClient().apply {
             this.logoutLambda = logoutLambda

features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/PinUnlockNode.kt

@@ -7,7 +7,6 @@
 
 package io.element.android.features.lockscreen.impl.unlock
 
-import androidx.activity.compose.LocalActivity
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.Modifier
@@ -18,8 +17,6 @@ import com.bumble.appyx.core.plugin.plugins
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
 import io.element.android.anvilannotations.ContributesNode
-import io.element.android.compound.theme.ElementTheme
-import io.element.android.features.logout.api.util.onSuccessLogout
 import io.element.android.libraries.di.SessionScope
 
 @ContributesNode(SessionScope::class)
@@ -41,8 +38,6 @@ class PinUnlockNode @AssistedInject constructor(
     @Composable
     override fun View(modifier: Modifier) {
         val state = presenter.present()
-        val activity = requireNotNull(LocalActivity.current)
-        val isDark = ElementTheme.isLightTheme.not()
         LaunchedEffect(state.isUnlocked) {
             if (state.isUnlocked) {
                 onUnlock()
@@ -53,7 +48,6 @@ class PinUnlockNode @AssistedInject constructor(
             // UnlockNode is only used for in-app unlock, so we can safely set isInAppUnlock to true.
             // It's set to false in PinUnlockActivity.
             isInAppUnlock = true,
-            onSuccessLogout = { onSuccessLogout(activity, isDark, it) },
             modifier = modifier
         )
     }

features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/PinUnlockPresenter.kt

@@ -53,7 +53,7 @@ class PinUnlockPresenter @Inject constructor(
             mutableStateOf(false)
         }
         val signOutAction = remember {
-            mutableStateOf<AsyncAction<String?>>(AsyncAction.Uninitialized)
+            mutableStateOf<AsyncAction<Unit>>(AsyncAction.Uninitialized)
         }
         var biometricUnlockResult by remember {
             mutableStateOf<BiometricAuthenticator.AuthenticationResult?>(null)
@@ -169,7 +169,7 @@ class PinUnlockPresenter @Inject constructor(
         }
     }
 
-    private fun CoroutineScope.signOut(signOutAction: MutableState<AsyncAction<String?>>) = launch {
+    private fun CoroutineScope.signOut(signOutAction: MutableState<AsyncAction<Unit>>) = launch {
         suspend {
             logoutUseCase.logout(ignoreSdkError = true)
         }.runCatchingUpdatingState(signOutAction)

features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/PinUnlockState.kt

@@ -18,7 +18,7 @@ data class PinUnlockState(
     val showWrongPinTitle: Boolean,
     val remainingAttempts: AsyncData<Int>,
     val showSignOutPrompt: Boolean,
-    val signOutAction: AsyncAction<String?>,
+    val signOutAction: AsyncAction<Unit>,
     val showBiometricUnlock: Boolean,
     val isUnlocked: Boolean,
     val biometricUnlockResult: BiometricAuthenticator.AuthenticationResult?,

features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/PinUnlockStateProvider.kt

@@ -41,7 +41,7 @@ fun aPinUnlockState(
     showBiometricUnlock: Boolean = true,
     biometricUnlockResult: BiometricAuthenticator.AuthenticationResult? = null,
     isUnlocked: Boolean = false,
-    signOutAction: AsyncAction<String?> = AsyncAction.Uninitialized,
+    signOutAction: AsyncAction<Unit> = AsyncAction.Uninitialized,
 ) = PinUnlockState(
     pinEntry = AsyncData.Success(pinEntry),
     showWrongPinTitle = showWrongPinTitle,

features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/PinUnlockView.kt

@@ -29,9 +29,7 @@ import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Lock
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
@@ -67,7 +65,6 @@ import io.element.android.libraries.ui.strings.CommonStrings
 fun PinUnlockView(
     state: PinUnlockState,
     isInAppUnlock: Boolean,
-    onSuccessLogout: (logoutUrlResult: String?) -> Unit,
     modifier: Modifier = Modifier,
 ) {
     OnLifecycleEvent { _, event ->
@@ -89,12 +86,7 @@ fun PinUnlockView(
             AsyncAction.Loading -> {
                 ProgressDialog(text = stringResource(id = R.string.screen_signout_in_progress_dialog_content))
             }
-            is AsyncAction.Success -> {
-                val latestOnSuccessLogout by rememberUpdatedState(onSuccessLogout)
-                LaunchedEffect(state) {
-                    latestOnSuccessLogout(state.signOutAction.data)
-                }
-            }
+            is AsyncAction.Success,
             is AsyncAction.Confirming,
             is AsyncAction.Failure,
             AsyncAction.Uninitialized -> Unit
@@ -369,7 +361,6 @@ internal fun PinUnlockViewInAppPreview(@PreviewParameter(PinUnlockStateProvider:
         PinUnlockView(
             state = state,
             isInAppUnlock = true,
-            onSuccessLogout = {},
         )
     }
 }
@@ -381,7 +372,6 @@ internal fun PinUnlockViewPreview(@PreviewParameter(PinUnlockStateProvider::clas
         PinUnlockView(
             state = state,
             isInAppUnlock = false,
-            onSuccessLogout = {},
         )
     }
 }

features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/activity/PinUnlockActivity.kt

@@ -15,14 +15,12 @@ import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.lifecycleScope
-import io.element.android.compound.theme.ElementTheme
 import io.element.android.features.enterprise.api.EnterpriseService
 import io.element.android.features.lockscreen.api.LockScreenLockState
 import io.element.android.features.lockscreen.api.LockScreenService
 import io.element.android.features.lockscreen.impl.unlock.PinUnlockPresenter
 import io.element.android.features.lockscreen.impl.unlock.PinUnlockView
 import io.element.android.features.lockscreen.impl.unlock.di.PinUnlockBindings
-import io.element.android.features.logout.api.util.onSuccessLogout
 import io.element.android.libraries.architecture.bindings
 import io.element.android.libraries.designsystem.theme.ElementThemeApp
 import io.element.android.libraries.preferences.api.store.AppPreferencesStore
@@ -51,11 +49,9 @@ class PinUnlockActivity : AppCompatActivity() {
                 enterpriseService = enterpriseService,
             ) {
                 val state = presenter.present()
-                val isDark = ElementTheme.isLightTheme.not()
                 PinUnlockView(
                     state = state,
                     isInAppUnlock = false,
-                    onSuccessLogout = { onSuccessLogout(this, isDark, it) },
                 )
             }
         }

features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/unlock/PinUnlockPresenterTest.kt

@@ -98,7 +98,7 @@ class PinUnlockPresenterTest {
 
     @Test
     fun `present - forgot pin flow`() = runTest {
-        val signOutLambda = lambdaRecorder<Boolean, String?> { "" }
+        val signOutLambda = lambdaRecorder<Boolean, Unit> {}
         val signOut = FakeLogoutUseCase(signOutLambda)
         val presenter = createPinUnlockPresenter(this, logoutUseCase = signOut)
         moleculeFlow(RecompositionMode.Immediate) {

features/logout/api/src/main/kotlin/io/element/android/features/logout/api/LogoutUseCase.kt

@@ -14,10 +14,8 @@ interface LogoutUseCase {
     /**
      * Log out the current user and then perform any needed cleanup tasks.
      * @param ignoreSdkError if true, the SDK error will be ignored and the user will be logged out anyway.
-     * @return an optional URL. When the URL is there, it should be presented to the user after logout for
-     * Relying Party (RP) initiated logout on their account page.
      */
-    suspend fun logout(ignoreSdkError: Boolean): String?
+    suspend fun logout(ignoreSdkError: Boolean)
 
     interface Factory {
         fun create(sessionId: String): LogoutUseCase

features/logout/api/src/main/kotlin/io/element/android/features/logout/api/direct/DirectLogoutState.kt

@@ -11,6 +11,6 @@ import io.element.android.libraries.architecture.AsyncAction
 
 data class DirectLogoutState(
     val canDoDirectSignOut: Boolean,
-    val logoutAction: AsyncAction<String?>,
+    val logoutAction: AsyncAction<Unit>,
     val eventSink: (DirectLogoutEvents) -> Unit,
 )

features/logout/api/src/main/kotlin/io/element/android/features/logout/api/direct/DirectLogoutStateProvider.kt

@@ -17,13 +17,13 @@ open class DirectLogoutStateProvider : PreviewParameterProvider<DirectLogoutStat
             aDirectLogoutState(logoutAction = AsyncAction.ConfirmingNoParams),
             aDirectLogoutState(logoutAction = AsyncAction.Loading),
             aDirectLogoutState(logoutAction = AsyncAction.Failure(Exception("Error"))),
-            aDirectLogoutState(logoutAction = AsyncAction.Success("success")),
+            aDirectLogoutState(logoutAction = AsyncAction.Success(Unit)),
         )
 }
 
 fun aDirectLogoutState(
     canDoDirectSignOut: Boolean = true,
-    logoutAction: AsyncAction<String?> = AsyncAction.Uninitialized,
+    logoutAction: AsyncAction<Unit> = AsyncAction.Uninitialized,
     eventSink: (DirectLogoutEvents) -> Unit = {},
 ) = DirectLogoutState(
     canDoDirectSignOut = canDoDirectSignOut,

features/logout/api/src/main/kotlin/io/element/android/features/logout/api/direct/DirectLogoutView.kt

@@ -11,8 +11,5 @@ import androidx.compose.runtime.Composable
 
 interface DirectLogoutView {
     @Composable
-    fun Render(
-        state: DirectLogoutState,
-        onSuccessLogout: (logoutUrlResult: String?) -> Unit
-    )
+    fun Render(state: DirectLogoutState)
 }

features/logout/api/src/main/kotlin/io/element/android/features/logout/api/util/Util.kt

@@ -19,9 +19,9 @@ class DefaultLogoutUseCase @Inject constructor(
     private val authenticationService: MatrixAuthenticationService,
     private val matrixClientProvider: MatrixClientProvider,
 ) : LogoutUseCase {
-    override suspend fun logout(ignoreSdkError: Boolean): String? {
+    override suspend fun logout(ignoreSdkError: Boolean) {
         val currentSession = authenticationService.getLatestSessionId()
-        return if (currentSession != null) {
+        if (currentSession != null) {
             matrixClientProvider.getOrRestore(currentSession)
                 .getOrThrow()
                 .logout(userInitiated = true, ignoreSdkError = true)

features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/DefaultLogoutUseCase.kt

@@ -7,7 +7,6 @@
 
 package io.element.android.features.logout.impl
 
-import androidx.activity.compose.LocalActivity
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import com.bumble.appyx.core.modality.BuildContext
@@ -17,9 +16,7 @@ import com.bumble.appyx.core.plugin.plugins
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
 import io.element.android.anvilannotations.ContributesNode
-import io.element.android.compound.theme.ElementTheme
 import io.element.android.features.logout.api.LogoutEntryPoint
-import io.element.android.features.logout.api.util.onSuccessLogout
 import io.element.android.libraries.di.SessionScope
 
 @ContributesNode(SessionScope::class)
@@ -35,14 +32,9 @@ class LogoutNode @AssistedInject constructor(
     @Composable
     override fun View(modifier: Modifier) {
         val state = presenter.present()
-        val activity = requireNotNull(LocalActivity.current)
-        val isDark = ElementTheme.isLightTheme.not()
         LogoutView(
             state = state,
             onChangeRecoveryKeyClick = ::onChangeRecoveryKeyClick,
-            onSuccessLogout = {
-                onSuccessLogout(activity, isDark, it)
-            },
             onBackClick = ::navigateUp,
             modifier = modifier,
         )

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

@@ -35,7 +35,7 @@ class LogoutPresenter @Inject constructor(
     @Composable
     override fun present(): LogoutState {
         val localCoroutineScope = rememberCoroutineScope()
-        val logoutAction: MutableState<AsyncAction<String?>> = remember {
+        val logoutAction: MutableState<AsyncAction<Unit>> = remember {
             mutableStateOf(AsyncAction.Uninitialized)
         }
 
@@ -91,7 +91,7 @@ class LogoutPresenter @Inject constructor(
     }
 
     private fun CoroutineScope.logout(
-        logoutAction: MutableState<AsyncAction<String?>>,
+        logoutAction: MutableState<AsyncAction<Unit>>,
         ignoreSdkError: Boolean,
     ) = launch {
         suspend {

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

@@ -18,6 +18,6 @@ data class LogoutState(
     val doesBackupExistOnServer: Boolean,
     val recoveryState: RecoveryState,
     val backupUploadState: BackupUploadState,
-    val logoutAction: AsyncAction<String?>,
+    val logoutAction: AsyncAction<Unit>,
     val eventSink: (LogoutEvents) -> Unit,
 )

features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/LogoutState.kt

@@ -38,7 +38,7 @@ fun aLogoutState(
     doesBackupExistOnServer: Boolean = true,
     recoveryState: RecoveryState = RecoveryState.ENABLED,
     backupUploadState: BackupUploadState = BackupUploadState.Unknown,
-    logoutAction: AsyncAction<String?> = AsyncAction.Uninitialized,
+    logoutAction: AsyncAction<Unit> = AsyncAction.Uninitialized,
     eventSink: (LogoutEvents) -> Unit = {},
 ) = LogoutState(
     isLastDevice = isLastDevice,

features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/LogoutStateProvider.kt

@@ -45,7 +45,6 @@ fun LogoutView(
     state: LogoutState,
     onChangeRecoveryKeyClick: () -> Unit,
     onBackClick: () -> Unit,
-    onSuccessLogout: (logoutUrlResult: String?) -> Unit,
     modifier: Modifier = Modifier,
 ) {
     val eventSink = state.eventSink
@@ -80,9 +79,6 @@ fun LogoutView(
         onDismissDialog = {
             eventSink(LogoutEvents.CloseDialogs)
         },
-        onSuccessLogout = {
-            onSuccessLogout(it)
-        },
     )
 }
 
@@ -177,7 +173,6 @@ internal fun LogoutViewPreview(
     LogoutView(
         state,
         onChangeRecoveryKeyClick = {},
-        onSuccessLogout = {},
         onBackClick = {},
     )
 }