Fixes after rebase

app/src/main/kotlin/io/element/android/x/intent/DefaultIntentProvider.kt

@@ -14,7 +14,7 @@ import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
 import dev.zacsweers.metro.Inject
 import io.element.android.libraries.deeplink.api.DeepLinkCreator
-import io.element.android.libraries.di.ApplicationContext
+import io.element.android.libraries.di.annotations.ApplicationContext
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.SessionId
 import io.element.android.libraries.matrix.api.core.ThreadId

features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/DefaultAnalyticsEntryPoint.kt

@@ -17,7 +17,7 @@ import io.element.android.libraries.architecture.createNode
 
 @ContributesBinding(AppScope::class)
 @Inject
-class DefaultAnalyticsEntryPoint() : AnalyticsEntryPoint {
+class DefaultAnalyticsEntryPoint : AnalyticsEntryPoint {
     override fun createNode(parentNode: Node, buildContext: BuildContext): Node {
         return parentNode.createNode<AnalyticsOptInNode>(buildContext)
     }

features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/LanguageTagProvider.kt

@@ -20,7 +20,7 @@ interface LanguageTagProvider {
 
 @ContributesBinding(AppScope::class)
 @Inject
-class DefaultLanguageTagProvider() : LanguageTagProvider {
+class DefaultLanguageTagProvider : LanguageTagProvider {
     @Composable
     override fun provideLanguageTag(): String? {
         return LocalConfiguration.current.locales.get(0)?.toLanguageTag()

features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/CallIntentDataParser.kt

@@ -12,7 +12,7 @@ import androidx.core.net.toUri
 import dev.zacsweers.metro.Inject
 
 @Inject
-class CallIntentDataParser() {
+class CallIntentDataParser {
     private val validHttpSchemes = sequenceOf("https")
     private val knownHosts = sequenceOf(
         "call.element.io",

features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/DefaultCallAnalyticCredentialsProvider.kt

@@ -15,7 +15,7 @@ import io.element.android.libraries.matrix.api.widget.CallAnalyticCredentialsPro
 
 @ContributesBinding(AppScope::class)
 @Inject
-class DefaultCallAnalyticCredentialsProvider() : CallAnalyticCredentialsProvider {
+class DefaultCallAnalyticCredentialsProvider : CallAnalyticCredentialsProvider {
     override val posthogUserId: String? = BuildConfig.POSTHOG_USER_ID.takeIf { it.isNotBlank() }
     override val posthogApiHost: String? = BuildConfig.POSTHOG_API_HOST.takeIf { it.isNotBlank() }
     override val posthogApiKey: String? = BuildConfig.POSTHOG_API_KEY.takeIf { it.isNotBlank() }

features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/DefaultCurrentCallService.kt

@@ -18,7 +18,7 @@ import kotlinx.coroutines.flow.MutableStateFlow
 @SingleIn(AppScope::class)
 @ContributesBinding(AppScope::class)
 @Inject
-class DefaultCurrentCallService() : CurrentCallService {
+class DefaultCurrentCallService : CurrentCallService {
     override val currentCall = MutableStateFlow<CurrentCall>(CurrentCall.None)
 
     fun onCallStarted(call: CurrentCall) {

features/changeroommemberroles/impl/src/main/kotlin/io/element/android/features/changeroommemberroles/impl/DefaultChangeRoomMemberRolesEntyPoint.kt

@@ -19,7 +19,7 @@ import io.element.android.libraries.matrix.api.room.JoinedRoom
 
 @ContributesBinding(SessionScope::class)
 @Inject
-class DefaultChangeRoomMemberRolesEntyPoint() : ChangeRoomMemberRolesEntryPoint {
+class DefaultChangeRoomMemberRolesEntyPoint : ChangeRoomMemberRolesEntryPoint {
     override fun builder(parentNode: Node, buildContext: BuildContext): ChangeRoomMemberRolesEntryPoint.Builder {
         return object : ChangeRoomMemberRolesEntryPoint.Builder {
             private lateinit var changeRoomMemberRolesListType: ChangeRoomMemberRolesListType

features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/DefaultCreateRoomEntryPoint.kt

@@ -18,7 +18,7 @@ import io.element.android.libraries.di.SessionScope
 
 @ContributesBinding(SessionScope::class)
 @Inject
-class DefaultCreateRoomEntryPoint() : CreateRoomEntryPoint {
+class DefaultCreateRoomEntryPoint : CreateRoomEntryPoint {
     override fun nodeBuilder(parentNode: Node, buildContext: BuildContext): CreateRoomEntryPoint.NodeBuilder {
         val plugins = ArrayList<Plugin>()
 

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

@@ -17,7 +17,7 @@ import io.element.android.libraries.architecture.createNode
 
 @ContributesBinding(AppScope::class)
 @Inject
-class DefaultAccountDeactivationEntryPoint() : AccountDeactivationEntryPoint {
+class DefaultAccountDeactivationEntryPoint : AccountDeactivationEntryPoint {
     override fun createNode(parentNode: Node, buildContext: BuildContext): Node {
         return parentNode.createNode<AccountDeactivationNode>(buildContext)
     }

features/enterprise/impl-foss/src/main/kotlin/io/element/android/features/enterprise/impl/DefaultEnterpriseService.kt

@@ -20,7 +20,7 @@ import kotlinx.coroutines.flow.flowOf
 
 @ContributesBinding(AppScope::class)
 @Inject
-class DefaultEnterpriseService() : EnterpriseService {
+class DefaultEnterpriseService : EnterpriseService {
     override val isEnterpriseBuild = false
 
     override suspend fun isEnterpriseUser(sessionId: SessionId) = false

features/enterprise/impl-foss/src/main/kotlin/io/element/android/features/enterprise/impl/DefaultSessionEnterpriseService.kt

@@ -14,7 +14,7 @@ import io.element.android.libraries.di.SessionScope
 
 @ContributesBinding(SessionScope::class)
 @Inject
-class DefaultSessionEnterpriseService() : SessionEnterpriseService {
+class DefaultSessionEnterpriseService : SessionEnterpriseService {
     override suspend fun init() = Unit
     override suspend fun isElementCallAvailable(): Boolean = true
 }

features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/DefaultFtueEntryPoint.kt

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

features/home/impl/src/main/kotlin/io/element/android/features/home/impl/DefaultHomeEntryPoint.kt

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

features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/selection/DefaultFilterSelectionStrategy.kt

@@ -15,7 +15,7 @@ import kotlinx.coroutines.flow.MutableStateFlow
 
 @ContributesBinding(SessionScope::class)
 @Inject
-class DefaultFilterSelectionStrategy() : FilterSelectionStrategy {
+class DefaultFilterSelectionStrategy : FilterSelectionStrategy {
     private val selectedFilters = LinkedHashSet<RoomListFilter>()
 
     override val filterSelectionStates = MutableStateFlow(buildFilters())

features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/acceptdecline/DefaultAcceptDeclineInviteView.kt

@@ -18,7 +18,7 @@ import io.element.android.libraries.matrix.api.core.RoomId
 
 @ContributesBinding(SessionScope::class)
 @Inject
-class DefaultAcceptDeclineInviteView() : AcceptDeclineInviteView {
+class DefaultAcceptDeclineInviteView : AcceptDeclineInviteView {
     @Composable
     override fun Render(
         state: AcceptDeclineInviteState,

features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockNode.kt

@@ -25,20 +25,20 @@ import io.element.android.libraries.di.SessionScope
 class DeclineAndBlockNode(
     @Assisted buildContext: BuildContext,
     @Assisted plugins: List<Plugin>,
-//    presenterFactory: DeclineAndBlockPresenter.Factory,
+    presenterFactory: DeclineAndBlockPresenter.Factory,
 ) : Node(buildContext, plugins = plugins) {
     data class Inputs(val inviteData: InviteData) : NodeInputs
 
     private val inviteData = inputs<Inputs>().inviteData
-//    private val presenter = presenterFactory.create(inviteData)
+    private val presenter = presenterFactory.create(inviteData)
 
     @Composable
     override fun View(modifier: Modifier) {
-//        val state = presenter.present()
+        val state = presenter.present()
-//        DeclineAndBlockView(
+        DeclineAndBlockView(
-//            state = state,
+            state = state,
-//            onBackClick = ::navigateUp,
+            onBackClick = ::navigateUp,
-//            modifier = modifier
+            modifier = modifier
-//        )
+        )
     }
 }

features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/declineandblock/DefaultDeclineAndBlockEntryPoint.kt

@@ -18,7 +18,7 @@ import io.element.android.libraries.architecture.createNode
 
 @ContributesBinding(AppScope::class)
 @Inject
-class DefaultDeclineAndBlockEntryPoint() : DeclineInviteAndBlockEntryPoint {
+class DefaultDeclineAndBlockEntryPoint : DeclineInviteAndBlockEntryPoint {
     override fun createNode(parentNode: Node, buildContext: BuildContext, inviteData: InviteData): Node {
         val inputs = DeclineAndBlockNode.Inputs(inviteData)
         return parentNode.createNode<DeclineAndBlockNode>(buildContext, plugins = listOf(inputs))

features/invitepeople/impl/src/main/kotlin/io/element/android/features/invitepeople/impl/DefaultInvitePeopleRenderer.kt

@@ -17,7 +17,7 @@ import io.element.android.libraries.di.SessionScope
 
 @ContributesBinding(SessionScope::class)
 @Inject
-class DefaultInvitePeopleRenderer() : InvitePeopleRenderer {
+class DefaultInvitePeopleRenderer : InvitePeopleRenderer {
     @Composable
     override fun Render(state: InvitePeopleState, modifier: Modifier) {
         if (state is DefaultInvitePeopleState) {

features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/DefaultJoinRoomEntryPoint.kt

@@ -17,7 +17,7 @@ import io.element.android.libraries.architecture.createNode
 
 @ContributesBinding(AppScope::class)
 @Inject
-class DefaultJoinRoomEntryPoint() : JoinRoomEntryPoint {
+class DefaultJoinRoomEntryPoint : JoinRoomEntryPoint {
     override fun createNode(parentNode: Node, buildContext: BuildContext, inputs: JoinRoomEntryPoint.Inputs): Node {
         return parentNode.createNode<JoinRoomFlowNode>(
             buildContext = buildContext,

features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/list/DefaultKnockRequestsListEntryPoint.kt

@@ -17,7 +17,7 @@ import io.element.android.libraries.architecture.createNode
 
 @ContributesBinding(AppScope::class)
 @Inject
-class DefaultKnockRequestsListEntryPoint() : KnockRequestsListEntryPoint {
+class DefaultKnockRequestsListEntryPoint : KnockRequestsListEntryPoint {
     override fun createNode(parentNode: Node, buildContext: BuildContext): Node {
         return parentNode.createNode<KnockRequestsListNode>(buildContext)
     }

features/leaveroom/impl/src/main/kotlin/io/element/android/features/leaveroom/impl/InternalLeaveRoomRenderer.kt

@@ -18,7 +18,7 @@ import io.element.android.libraries.matrix.api.core.RoomId
 
 @ContributesBinding(SessionScope::class)
 @Inject
-class InternalLeaveRoomRenderer() : LeaveRoomRenderer {
+class InternalLeaveRoomRenderer : LeaveRoomRenderer {
     @Composable
     override fun Render(state: LeaveRoomState, onSelectNewOwners: (RoomId) -> Unit, modifier: Modifier) {
         if (state is InternalLeaveRoomState) {

features/licenses/impl/src/main/kotlin/io/element/android/features/licenses/impl/DefaultOpenSourcesLicensesEntryPoint.kt

@@ -17,7 +17,7 @@ import io.element.android.libraries.architecture.createNode
 
 @ContributesBinding(AppScope::class)
 @Inject
-class DefaultOpenSourcesLicensesEntryPoint() : OpenSourceLicensesEntryPoint {
+class DefaultOpenSourcesLicensesEntryPoint : OpenSourceLicensesEntryPoint {
     override fun getNode(node: Node, buildContext: BuildContext): Node {
         return node.createNode<DependenciesFlowNode>(buildContext)
     }

features/location/impl/src/main/kotlin/io/element/android/features/location/impl/DefaultLocationService.kt

@@ -15,7 +15,7 @@ import io.element.android.features.location.api.LocationService
 
 @ContributesBinding(AppScope::class)
 @Inject
-class DefaultLocationService() : LocationService {
+class DefaultLocationService : LocationService {
     override fun isServiceAvailable(): Boolean {
         return BuildConfig.MAPTILER_API_KEY.isNotEmpty()
     }

features/location/impl/src/main/kotlin/io/element/android/features/location/impl/send/DefaultSendLocationEntryPoint.kt

@@ -18,7 +18,7 @@ import io.element.android.libraries.matrix.api.timeline.Timeline
 
 @ContributesBinding(AppScope::class)
 @Inject
-class DefaultSendLocationEntryPoint() : SendLocationEntryPoint {
+class DefaultSendLocationEntryPoint : SendLocationEntryPoint {
     override fun builder(timelineMode: Timeline.Mode): SendLocationEntryPoint.Builder {
         return Builder(timelineMode)
     }

features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/DefaultShowLocationEntryPoint.kt

@@ -17,7 +17,7 @@ import io.element.android.libraries.architecture.createNode
 
 @ContributesBinding(AppScope::class)
 @Inject
-class DefaultShowLocationEntryPoint() : ShowLocationEntryPoint {
+class DefaultShowLocationEntryPoint : ShowLocationEntryPoint {
     override fun createNode(parentNode: Node, buildContext: BuildContext, inputs: ShowLocationEntryPoint.Inputs): Node {
         return parentNode.createNode<ShowLocationNode>(buildContext, listOf(inputs))
     }

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

@@ -20,7 +20,7 @@ import io.element.android.libraries.architecture.createNode
 
 @ContributesBinding(AppScope::class)
 @Inject
-class DefaultLockScreenEntryPoint() : LockScreenEntryPoint {
+class DefaultLockScreenEntryPoint : LockScreenEntryPoint {
     override fun nodeBuilder(parentNode: Node, buildContext: BuildContext, navTarget: LockScreenEntryPoint.Target): LockScreenEntryPoint.NodeBuilder {
         val callbacks = mutableListOf<LockScreenEntryPoint.Callback>()
 

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

@@ -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>()
 

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

@@ -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

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

@@ -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

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

@@ -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 dev.zacsweers.metro.AppScope
-import io.element.android.libraries.di.AppScope
+import dev.zacsweers.metro.ContributesBinding
-import io.element.android.libraries.di.ApplicationContext
+import dev.zacsweers.metro.Inject
-import javax.inject.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")

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

@@ -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 {
+    ) : QrCodeLoginGraph.Factory {
-        override fun create(): QrCodeLoginComponent {
+        override fun create(): QrCodeLoginGraph {
-            return FakeQrCodeLoginComponent(qrCodeLoginManager)
+            return FakeQrCodeLoginGraph(qrCodeLoginManager)
         }
     }
 }

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

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

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

@@ -22,7 +22,7 @@ import io.element.android.libraries.di.SessionScope
 
 @ContributesBinding(SessionScope::class)
 @Inject
-class DefaultDirectLogoutView() : DirectLogoutView {
+class DefaultDirectLogoutView : DirectLogoutView {
     @Composable
     override fun Render(state: DirectLogoutState) {
         val eventSink = state.eventSink

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/draft/VolatileComposerDraftStore.kt

@@ -18,7 +18,7 @@ import io.element.android.libraries.matrix.api.room.draft.ComposerDraft
  * Currently it's used to store draft message when moving to edit mode.
  */
 @Inject
-class VolatileComposerDraftStore() : ComposerDraftStore {
+class VolatileComposerDraftStore : ComposerDraftStore {
     private val drafts: MutableMap<String, ComposerDraft> = mutableMapOf()
 
     override suspend fun loadDraft(roomId: RoomId, threadRoot: ThreadId?): ComposerDraft? {

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/link/LinkChecker.kt

@@ -21,7 +21,7 @@ interface LinkChecker {
 
 @ContributesBinding(AppScope::class)
 @Inject
-class DefaultLinkChecker() : LinkChecker {
+class DefaultLinkChecker : LinkChecker {
     override fun isSafe(link: Link): Boolean {
         return if (link.url.containsRtLOverride()) {
             false

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/DefaultMessageComposerContext.kt

@@ -20,7 +20,7 @@ import io.element.android.libraries.textcomposer.model.MessageComposerMode
 @SingleIn(RoomScope::class)
 @ContributesBinding(RoomScope::class)
 @Inject
-class DefaultMessageComposerContext() : MessageComposerContext {
+class DefaultMessageComposerContext : MessageComposerContext {
     override var composerMode: MessageComposerMode by mutableStateOf(MessageComposerMode.Normal)
         internal set
 }

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/RichTextEditorStateFactory.kt

@@ -21,7 +21,7 @@ interface RichTextEditorStateFactory {
 
 @ContributesBinding(AppScope::class)
 @Inject
-class DefaultRichTextEditorStateFactory() : RichTextEditorStateFactory {
+class DefaultRichTextEditorStateFactory : RichTextEditorStateFactory {
     @Composable
     override fun remember(): RichTextEditorState {
         return rememberRichTextEditorState()

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/suggestions/SuggestionsProcessor.kt

@@ -22,7 +22,7 @@ import io.element.android.libraries.textcomposer.model.SuggestionType
  * This class is responsible for processing suggestions when `@`, `/` or `#` are type in the composer.
  */
 @Inject
-class SuggestionsProcessor() {
+class SuggestionsProcessor {
     /**
      *  Process the suggestion.
      *  @param suggestion The current suggestion input

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineItemIndexer.kt

@@ -16,7 +16,7 @@ import kotlinx.coroutines.sync.withLock
 import timber.log.Timber
 
 @Inject
-class TimelineItemIndexer() {
+class TimelineItemIndexer {
     // This is a latch to wait for the first process call
     private val firstProcessLatch = CompletableDeferred<Unit>()
     private val timelineEventsIndexes = mutableMapOf<EventId, Int>()

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/receipt/bottomsheet/ReadReceiptBottomSheetPresenter.kt

@@ -17,7 +17,7 @@ import io.element.android.features.messages.impl.timeline.model.TimelineItem
 import io.element.android.libraries.architecture.Presenter
 
 @Inject
-class ReadReceiptBottomSheetPresenter() : Presenter<ReadReceiptBottomSheetState> {
+class ReadReceiptBottomSheetPresenter : Presenter<ReadReceiptBottomSheetState> {
     @Composable
     override fun present(): ReadReceiptBottomSheetState {
         var selectedEvent: TimelineItem.Event? by remember { mutableStateOf(null) }

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentFailedToParseMessageFactory.kt

@@ -13,7 +13,7 @@ import io.element.android.features.messages.impl.timeline.model.event.TimelineIt
 import io.element.android.libraries.matrix.api.timeline.item.event.FailedToParseMessageLikeContent
 
 @Inject
-class TimelineItemContentFailedToParseMessageFactory() {
+class TimelineItemContentFailedToParseMessageFactory {
     fun create(@Suppress("UNUSED_PARAMETER") failedToParseMessageLike: FailedToParseMessageLikeContent): TimelineItemEventContent {
         return TimelineItemUnknownContent
     }

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentFailedToParseStateFactory.kt

@@ -13,7 +13,7 @@ import io.element.android.features.messages.impl.timeline.model.event.TimelineIt
 import io.element.android.libraries.matrix.api.timeline.item.event.FailedToParseStateContent
 
 @Inject
-class TimelineItemContentFailedToParseStateFactory() {
+class TimelineItemContentFailedToParseStateFactory {
     @Suppress("UNUSED_PARAMETER")
     fun create(failedToParseState: FailedToParseStateContent): TimelineItemEventContent {
         return TimelineItemUnknownContent

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentRedactedFactory.kt

@@ -13,7 +13,7 @@ import io.element.android.features.messages.impl.timeline.model.event.TimelineIt
 import io.element.android.libraries.matrix.api.timeline.item.event.RedactedContent
 
 @Inject
-class TimelineItemContentRedactedFactory() {
+class TimelineItemContentRedactedFactory {
     fun create(@Suppress("UNUSED_PARAMETER") content: RedactedContent): TimelineItemEventContent {
         return TimelineItemRedactedContent
     }

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentUTDFactory.kt

@@ -13,7 +13,7 @@ import io.element.android.features.messages.impl.timeline.model.event.TimelineIt
 import io.element.android.libraries.matrix.api.timeline.item.event.UnableToDecryptContent
 
 @Inject
-class TimelineItemContentUTDFactory() {
+class TimelineItemContentUTDFactory {
     fun create(content: UnableToDecryptContent): TimelineItemEventContent {
         return TimelineItemEncryptedContent(content.data)
     }

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/groups/TimelineItemGrouper.kt

@@ -17,7 +17,7 @@ import kotlinx.collections.immutable.toImmutableList
 
 @SingleIn(RoomScope::class)
 @Inject
-class TimelineItemGrouper() {
+class TimelineItemGrouper {
     /**
      * Keys are identifier of items in a group, only one by group will be kept.
      * Values are the actual groupIds.

features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/create/DefaultCreatePollEntryPoint.kt

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

features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/DefaultPollHistoryEntryPoint.kt

@@ -17,7 +17,7 @@ import io.element.android.libraries.architecture.createNode
 
 @ContributesBinding(AppScope::class)
 @Inject
-class DefaultPollHistoryEntryPoint() : PollHistoryEntryPoint {
+class DefaultPollHistoryEntryPoint : PollHistoryEntryPoint {
     override fun createNode(parentNode: Node, buildContext: BuildContext): Node {
         return parentNode.createNode<PollHistoryFlowNode>(buildContext)
     }

features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/DefaultCacheService.kt

@@ -19,7 +19,7 @@ import kotlinx.coroutines.flow.MutableSharedFlow
 @SingleIn(AppScope::class)
 @ContributesBinding(AppScope::class)
 @Inject
-class DefaultCacheService() : CacheService {
+class DefaultCacheService : CacheService {
     private val _clearedCacheEventFlow = MutableSharedFlow<SessionId>(0)
     override val clearedCacheEventFlow: Flow<SessionId> = _clearedCacheEventFlow
 

features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/DefaultPreferencesEntryPoint.kt

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

features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/about/AboutPresenter.kt

@@ -12,7 +12,7 @@ import dev.zacsweers.metro.Inject
 import io.element.android.libraries.architecture.Presenter
 
 @Inject
-class AboutPresenter() : Presenter<AboutState> {
+class AboutPresenter : Presenter<AboutState> {
     @Composable
     override fun present(): AboutState {
         return AboutState(

features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/bugreport/DefaultBugReportEntryPoint.kt

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

features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/di/RageshakeBindings.kt

@@ -7,9 +7,9 @@
 
 package io.element.android.features.rageshake.impl.di
 
-import com.squareup.anvil.annotations.ContributesTo
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesTo
 import io.element.android.features.rageshake.impl.crash.PreferencesCrashDataStore
-import io.element.android.libraries.di.AppScope
 
 @ContributesTo(AppScope::class)
 interface RageshakeBindings {

features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/reporter/BugReportAppNameProvider.kt

@@ -18,6 +18,6 @@ fun interface BugReportAppNameProvider {
 
 @ContributesBinding(AppScope::class)
 @Inject
-class DefaultBugReportAppNameProvider() : BugReportAppNameProvider {
+class DefaultBugReportAppNameProvider : BugReportAppNameProvider {
     override fun provide(): String = RageshakeConfig.BUG_REPORT_APP_NAME
 }

features/reportroom/impl/src/main/kotlin/io/element/android/features/reportroom/impl/DefaultReportRoomEntryPoint.kt

@@ -18,7 +18,7 @@ import io.element.android.libraries.matrix.api.core.RoomId
 
 @ContributesBinding(AppScope::class)
 @Inject
-class DefaultReportRoomEntryPoint() : ReportRoomEntryPoint {
+class DefaultReportRoomEntryPoint : ReportRoomEntryPoint {
     override fun createNode(parentNode: Node, buildContext: BuildContext, roomId: RoomId): Node {
         return parentNode.createNode<ReportRoomNode>(buildContext, plugins = listOf(ReportRoomNode.Inputs(roomId)))
     }

features/roomaliasresolver/impl/src/main/kotlin/io/element/android/features/roomaliasresolver/impl/DefaultRoomAliasResolverEntryPoint.kt

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

features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/DefaultRoomDetailsEntryPoint.kt

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

features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/DefaultRoomDirectoryEntryPoint.kt

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

features/roommembermoderation/impl/src/main/kotlin/io/element/android/features/roommembermoderation/impl/DefaultRoomMemberModerationRenderer.kt

@@ -21,7 +21,7 @@ import timber.log.Timber
 
 @ContributesBinding(RoomScope::class)
 @Inject
-class DefaultRoomMemberModerationRenderer() : RoomMemberModerationRenderer {
+class DefaultRoomMemberModerationRenderer : RoomMemberModerationRenderer {
     @Composable
     override fun Render(
         state: RoomMemberModerationState,

features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/DefaultSecureBackupEntryPoint.kt

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

features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/setup/SecureBackupSetupStateMachine.kt

@@ -16,7 +16,7 @@ import kotlinx.coroutines.ExperimentalCoroutinesApi
 import com.freeletics.flowredux.dsl.State as MachineState
 
 @Inject
-class SecureBackupSetupStateMachine() : FlowReduxStateMachine<SecureBackupSetupStateMachine.State, SecureBackupSetupStateMachine.Event>(
+class SecureBackupSetupStateMachine : FlowReduxStateMachine<SecureBackupSetupStateMachine.State, SecureBackupSetupStateMachine.Event>(
     initialState = State.Initial
 ) {
     init {

features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/tools/RecoveryKeyTools.kt

@@ -13,7 +13,7 @@ private const val RECOVERY_KEY_LENGTH = 48
 private const val BASE_58_ALPHABET = "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz"
 
 @Inject
-class RecoveryKeyTools() {
+class RecoveryKeyTools {
     fun isRecoveryKeyFormatValid(recoveryKey: String): Boolean {
         val recoveryKeyWithoutSpace = recoveryKey.replace("\\s+".toRegex(), "")
         return recoveryKeyWithoutSpace.length == RECOVERY_KEY_LENGTH && recoveryKeyWithoutSpace.all { BASE_58_ALPHABET.contains(it) }

features/share/impl/src/main/kotlin/io/element/android/features/share/impl/DefaultShareEntryPoint.kt

@@ -18,7 +18,7 @@ import io.element.android.libraries.di.SessionScope
 
 @ContributesBinding(SessionScope::class)
 @Inject
-class DefaultShareEntryPoint() : ShareEntryPoint {
+class DefaultShareEntryPoint : ShareEntryPoint {
     override fun nodeBuilder(parentNode: Node, buildContext: BuildContext): ShareEntryPoint.NodeBuilder {
         val plugins = ArrayList<Plugin>()
 

features/signedout/impl/src/main/kotlin/io/element/android/features/signedout/impl/DefaultSignedOutEntryPoint.kt

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

features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/DefaultStartChatEntryPoint.kt

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

features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/userlist/UserListDataStore.kt

@@ -13,7 +13,7 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 
 @Inject
-class UserListDataStore() {
+class UserListDataStore {
     private val _selectedUsers: MutableStateFlow<List<MatrixUser>> = MutableStateFlow(emptyList())
 
     fun selectUser(user: MatrixUser) {

features/userprofile/impl/src/main/kotlin/io/element/android/features/userprofile/impl/DefaultUserProfileEntryPoint.kt

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

features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/incoming/DefaultIncomingVerificationEntryPoint.kt

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

features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/DefaultOutgoingVerificationEntryPoint.kt

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

features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/OutgoingVerificationNode.kt

@@ -25,26 +25,26 @@ import io.element.android.libraries.di.SessionScope
 class OutgoingVerificationNode(
     @Assisted buildContext: BuildContext,
     @Assisted plugins: List<Plugin>,
-//    presenterFactory: OutgoingVerificationPresenter.Factory,
+    presenterFactory: OutgoingVerificationPresenter.Factory,
 ) : Node(buildContext, plugins = plugins) {
     private val callback = plugins<OutgoingVerificationEntryPoint.Callback>().first()
 
     private val inputs = inputs<OutgoingVerificationEntryPoint.Params>()
 
-//    private val presenter = presenterFactory.create(
+    private val presenter = presenterFactory.create(
-//        showDeviceVerifiedScreen = inputs.showDeviceVerifiedScreen,
+        showDeviceVerifiedScreen = inputs.showDeviceVerifiedScreen,
-//        verificationRequest = inputs.verificationRequest,
+        verificationRequest = inputs.verificationRequest,
-//    )
+    )
 
     @Composable
     override fun View(modifier: Modifier) {
-//        val state = presenter.present()
+        val state = presenter.present()
-//        OutgoingVerificationView(
+        OutgoingVerificationView(
-//            state = state,
+            state = state,
-//            modifier = modifier,
+            modifier = modifier,
-//            onLearnMoreClick = callback::onLearnMoreAboutEncryption,
+            onLearnMoreClick = callback::onLearnMoreAboutEncryption,
-//            onFinish = callback::onDone,
+            onFinish = callback::onDone,
-//            onBack = callback::onBack,
+            onBack = callback::onBack,
-//        )
+        )
     }
 }

features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/OutgoingVerificationPresenter.kt

@@ -9,150 +9,172 @@
 
 package io.element.android.features.verifysession.impl.outgoing
 
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
+import com.freeletics.flowredux.compose.rememberStateAndDispatch
+import dev.zacsweers.metro.Assisted
+import dev.zacsweers.metro.AssistedFactory
+import dev.zacsweers.metro.Inject
+import io.element.android.libraries.architecture.AsyncData
+import io.element.android.libraries.architecture.Presenter
+import io.element.android.libraries.matrix.api.encryption.EncryptionService
+import io.element.android.libraries.matrix.api.verification.SessionVerificationService
+import io.element.android.libraries.matrix.api.verification.SessionVerifiedStatus
+import io.element.android.libraries.matrix.api.verification.VerificationFlowState
+import io.element.android.libraries.matrix.api.verification.VerificationRequest
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
+import timber.log.Timber
+import io.element.android.features.verifysession.impl.outgoing.OutgoingVerificationStateMachine.Event as StateMachineEvent
+import io.element.android.features.verifysession.impl.outgoing.OutgoingVerificationStateMachine.State as StateMachineState
 
-// @Inject
+@Inject
-// class OutgoingVerificationPresenter(
+class OutgoingVerificationPresenter(
-//    @Assisted private val showDeviceVerifiedScreen: Boolean,
+    @Assisted private val showDeviceVerifiedScreen: Boolean,
-//    @Assisted private val verificationRequest: VerificationRequest.Outgoing,
+    @Assisted private val verificationRequest: VerificationRequest.Outgoing,
-//    private val sessionVerificationService: SessionVerificationService,
+    private val sessionVerificationService: SessionVerificationService,
-//    private val encryptionService: EncryptionService,
+    private val encryptionService: EncryptionService,
-// ) : Presenter<OutgoingVerificationState> {
+) : Presenter<OutgoingVerificationState> {
-//    @AssistedFactory
+    @AssistedFactory
-//    interface Factory {
+    interface Factory {
-//        fun create(
+        fun create(
-//            verificationRequest: VerificationRequest.Outgoing,
+            verificationRequest: VerificationRequest.Outgoing,
-//            showDeviceVerifiedScreen: Boolean,
+            showDeviceVerifiedScreen: Boolean,
-//        ): OutgoingVerificationPresenter
+        ): OutgoingVerificationPresenter
-//    }
+    }
-//
+
-//    private val stateMachine = OutgoingVerificationStateMachine(
+    private val stateMachine = OutgoingVerificationStateMachine(
-//        sessionVerificationService = sessionVerificationService,
+        sessionVerificationService = sessionVerificationService,
-//        encryptionService = encryptionService,
+        encryptionService = encryptionService,
-//    )
+    )
-//
+
-//    @Composable
+    @Composable
-//    override fun present(): OutgoingVerificationState {
+    override fun present(): OutgoingVerificationState {
-//        val stateAndDispatch = stateMachine.rememberStateAndDispatch()
+        val stateAndDispatch = stateMachine.rememberStateAndDispatch()
-//
+
-//        val sessionVerifiedStatus by sessionVerificationService.sessionVerifiedStatus.collectAsState()
+        val sessionVerifiedStatus by sessionVerificationService.sessionVerifiedStatus.collectAsState()
-//        val step by remember {
+        val step by remember {
-//            derivedStateOf {
+            derivedStateOf {
-//                when (verificationRequest) {
+                when (verificationRequest) {
-//                    is VerificationRequest.Outgoing.CurrentSession -> {
+                    is VerificationRequest.Outgoing.CurrentSession -> {
-//                        when (sessionVerifiedStatus) {
+                        when (sessionVerifiedStatus) {
-//                            SessionVerifiedStatus.Unknown -> OutgoingVerificationState.Step.Loading
+                            SessionVerifiedStatus.Unknown -> OutgoingVerificationState.Step.Loading
-//                            SessionVerifiedStatus.NotVerified -> {
+                            SessionVerifiedStatus.NotVerified -> {
-//                                stateAndDispatch.state.value.toVerificationStep()
+                                stateAndDispatch.state.value.toVerificationStep()
-//                            }
+                            }
-//                            SessionVerifiedStatus.Verified -> {
+                            SessionVerifiedStatus.Verified -> {
-//                                if (stateAndDispatch.state.value != StateMachineState.Initial || showDeviceVerifiedScreen) {
+                                if (stateAndDispatch.state.value != StateMachineState.Initial || showDeviceVerifiedScreen) {
-//                                    // The user has verified the session, we need to show the success screen
+                                    // The user has verified the session, we need to show the success screen
-//                                    OutgoingVerificationState.Step.Completed
+                                    OutgoingVerificationState.Step.Completed
-//                                } else {
+                                } else {
-//                                    // Automatic verification, which can happen on freshly created account, in this case, skip the screen
+                                    // Automatic verification, which can happen on freshly created account, in this case, skip the screen
-//                                    OutgoingVerificationState.Step.Exit
+                                    OutgoingVerificationState.Step.Exit
-//                                }
+                                }
-//                            }
+                            }
-//                        }
+                        }
-//                    }
+                    }
-//                    is VerificationRequest.Outgoing.User -> stateAndDispatch.state.value.toVerificationStep()
+                    is VerificationRequest.Outgoing.User -> stateAndDispatch.state.value.toVerificationStep()
-//                }
+                }
-//            }
+            }
-//        }
+        }
-//
+
-//        // Start this after observing state machine
+        // Start this after observing state machine
-//        LaunchedEffect(Unit) {
+        LaunchedEffect(Unit) {
-//            // Force reset, just in case the service was left in a broken state
+            // Force reset, just in case the service was left in a broken state
-//            sessionVerificationService.reset(cancelAnyPendingVerificationAttempt = true)
+            sessionVerificationService.reset(cancelAnyPendingVerificationAttempt = true)
-//
+
-//            observeVerificationService()
+            observeVerificationService()
-//        }
+        }
-//
+
-//        fun handleEvents(event: OutgoingVerificationViewEvents) {
+        fun handleEvents(event: OutgoingVerificationViewEvents) {
-//            Timber.d("Verification user action: ${event::class.simpleName}")
+            Timber.d("Verification user action: ${event::class.simpleName}")
-//            when (event) {
+            when (event) {
-//                // Just relay the event to the state machine
+                // Just relay the event to the state machine
-//                OutgoingVerificationViewEvents.RequestVerification -> StateMachineEvent.RequestVerification(verificationRequest)
+                OutgoingVerificationViewEvents.RequestVerification -> StateMachineEvent.RequestVerification(verificationRequest)
-//                OutgoingVerificationViewEvents.StartSasVerification -> StateMachineEvent.StartSasVerification
+                OutgoingVerificationViewEvents.StartSasVerification -> StateMachineEvent.StartSasVerification
-//                OutgoingVerificationViewEvents.ConfirmVerification -> StateMachineEvent.AcceptChallenge
+                OutgoingVerificationViewEvents.ConfirmVerification -> StateMachineEvent.AcceptChallenge
-//                OutgoingVerificationViewEvents.DeclineVerification -> StateMachineEvent.DeclineChallenge
+                OutgoingVerificationViewEvents.DeclineVerification -> StateMachineEvent.DeclineChallenge
-//                OutgoingVerificationViewEvents.Cancel -> StateMachineEvent.Cancel
+                OutgoingVerificationViewEvents.Cancel -> StateMachineEvent.Cancel
-//                OutgoingVerificationViewEvents.Reset -> StateMachineEvent.Reset
+                OutgoingVerificationViewEvents.Reset -> StateMachineEvent.Reset
-//            }.let { stateMachineEvent ->
+            }.let { stateMachineEvent ->
-//                stateAndDispatch.dispatchAction(stateMachineEvent)
+                stateAndDispatch.dispatchAction(stateMachineEvent)
-//            }
+            }
-//        }
+        }
-//        return OutgoingVerificationState(
+        return OutgoingVerificationState(
-//            step = step,
+            step = step,
-//            request = verificationRequest,
+            request = verificationRequest,
-//            eventSink = ::handleEvents,
+            eventSink = ::handleEvents,
-//        )
+        )
-//    }
+    }
-//
+
-//    private fun StateMachineState?.toVerificationStep(): OutgoingVerificationState.Step =
+    private fun StateMachineState?.toVerificationStep(): OutgoingVerificationState.Step =
-//        when (val machineState = this) {
+        when (val machineState = this) {
-//            StateMachineState.Initial, null -> {
+            StateMachineState.Initial, null -> {
-//                OutgoingVerificationState.Step.Initial
+                OutgoingVerificationState.Step.Initial
-//            }
+            }
-//            is StateMachineState.RequestingVerification,
+            is StateMachineState.RequestingVerification,
-//            is StateMachineState.StartingSasVerification,
+            is StateMachineState.StartingSasVerification,
-//            StateMachineState.SasVerificationStarted -> {
+            StateMachineState.SasVerificationStarted -> {
-//                OutgoingVerificationState.Step.AwaitingOtherDeviceResponse
+                OutgoingVerificationState.Step.AwaitingOtherDeviceResponse
-//            }
+            }
-//
+
-//            StateMachineState.VerificationRequestAccepted -> {
+            StateMachineState.VerificationRequestAccepted -> {
-//                OutgoingVerificationState.Step.Ready
+                OutgoingVerificationState.Step.Ready
-//            }
+            }
-//
+
-//            is StateMachineState.Canceled -> {
+            is StateMachineState.Canceled -> {
-//                OutgoingVerificationState.Step.Canceled
+                OutgoingVerificationState.Step.Canceled
-//            }
+            }
-//
+
-//            is StateMachineState.Verifying -> {
+            is StateMachineState.Verifying -> {
-//                val async = when (machineState) {
+                val async = when (machineState) {
-//                    is StateMachineState.Verifying.Replying -> AsyncData.Loading()
+                    is StateMachineState.Verifying.Replying -> AsyncData.Loading()
-//                    else -> AsyncData.Uninitialized
+                    else -> AsyncData.Uninitialized
-//                }
+                }
-//                OutgoingVerificationState.Step.Verifying(machineState.data, async)
+                OutgoingVerificationState.Step.Verifying(machineState.data, async)
-//            }
+            }
-//
+
-//            StateMachineState.Completed -> {
+            StateMachineState.Completed -> {
-//                OutgoingVerificationState.Step.Completed
+                OutgoingVerificationState.Step.Completed
-//            }
+            }
-//
+
-//            StateMachineState.Exit -> {
+            StateMachineState.Exit -> {
-//                OutgoingVerificationState.Step.Exit
+                OutgoingVerificationState.Step.Exit
-//            }
+            }
-//        }
+        }
-//
+
-//    private fun CoroutineScope.observeVerificationService() {
+    private fun CoroutineScope.observeVerificationService() {
-//        sessionVerificationService.verificationFlowState
+        sessionVerificationService.verificationFlowState
-//            .onEach { Timber.d("Verification flow state: ${it::class.simpleName}") }
+            .onEach { Timber.d("Verification flow state: ${it::class.simpleName}") }
-//            .onEach { verificationAttemptState ->
+            .onEach { verificationAttemptState ->
-//                when (verificationAttemptState) {
+                when (verificationAttemptState) {
-//                    VerificationFlowState.Initial -> stateMachine.dispatch(StateMachineEvent.Reset)
+                    VerificationFlowState.Initial -> stateMachine.dispatch(StateMachineEvent.Reset)
-//                    VerificationFlowState.DidAcceptVerificationRequest -> {
+                    VerificationFlowState.DidAcceptVerificationRequest -> {
-//                        stateMachine.dispatch(StateMachineEvent.DidAcceptVerificationRequest)
+                        stateMachine.dispatch(StateMachineEvent.DidAcceptVerificationRequest)
-//                    }
+                    }
-//                    VerificationFlowState.DidStartSasVerification -> {
+                    VerificationFlowState.DidStartSasVerification -> {
-//                        stateMachine.dispatch(StateMachineEvent.DidStartSasVerification)
+                        stateMachine.dispatch(StateMachineEvent.DidStartSasVerification)
-//                    }
+                    }
-//                    is VerificationFlowState.DidReceiveVerificationData -> {
+                    is VerificationFlowState.DidReceiveVerificationData -> {
-//                        stateMachine.dispatch(StateMachineEvent.DidReceiveChallenge(verificationAttemptState.data))
+                        stateMachine.dispatch(StateMachineEvent.DidReceiveChallenge(verificationAttemptState.data))
-//                    }
+                    }
-//                    VerificationFlowState.DidFinish -> {
+                    VerificationFlowState.DidFinish -> {
-//                        stateMachine.dispatch(StateMachineEvent.DidAcceptChallenge)
+                        stateMachine.dispatch(StateMachineEvent.DidAcceptChallenge)
-//                    }
+                    }
-//                    VerificationFlowState.DidCancel -> {
+                    VerificationFlowState.DidCancel -> {
-//                        stateMachine.dispatch(StateMachineEvent.DidCancel)
+                        stateMachine.dispatch(StateMachineEvent.DidCancel)
-//                    }
+                    }
-//                    VerificationFlowState.DidFail -> {
+                    VerificationFlowState.DidFail -> {
-//                        stateMachine.dispatch(StateMachineEvent.DidFail)
+                        stateMachine.dispatch(StateMachineEvent.DidFail)
-//                    }
+                    }
-//                }
+                }
-//            }
+            }
-//            .launchIn(this)
+            .launchIn(this)
-//    }
+    }
-// }
+}

features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/DefaultTextFileViewer.kt

@@ -19,7 +19,7 @@ import kotlinx.collections.immutable.ImmutableList
 
 @ContributesBinding(AppScope::class)
 @Inject
-class DefaultTextFileViewer() : TextFileViewer {
+class DefaultTextFileViewer : TextFileViewer {
     @Composable
     override fun Render(
         lines: ImmutableList<String>,

features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/DefaultViewFolderEntryPoint.kt

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

libraries/cryptography/impl/src/main/kotlin/io/element/android/libraries/cryptography/impl/AESEncryptionDecryptionService.kt

@@ -22,7 +22,7 @@ import javax.crypto.spec.GCMParameterSpec
  */
 @ContributesBinding(AppScope::class)
 @Inject
-class AESEncryptionDecryptionService() : EncryptionDecryptionService {
+class AESEncryptionDecryptionService : EncryptionDecryptionService {
     override fun createEncryptionCipher(key: SecretKey): Cipher {
         return Cipher.getInstance(AESEncryptionSpecs.CIPHER_TRANSFORMATION).apply {
             init(Cipher.ENCRYPT_MODE, key)

libraries/deeplink/impl/src/main/kotlin/io/element/android/libraries/deeplink/impl/DefaultDeepLinkCreator.kt

@@ -16,7 +16,8 @@ import io.element.android.libraries.matrix.api.core.SessionId
 import io.element.android.libraries.matrix.api.core.ThreadId
 
 @ContributesBinding(AppScope::class)
-class DefaultDeepLinkCreator @Inject constructor() : DeepLinkCreator {
+@Inject
+class DefaultDeepLinkCreator : DeepLinkCreator {
     override fun create(sessionId: SessionId, roomId: RoomId?, threadId: ThreadId?): String {
         return buildString {
             append("$SCHEME://$HOST/")

libraries/deeplink/impl/src/main/kotlin/io/element/android/libraries/deeplink/impl/DefaultDeeplinkParser.kt

@@ -20,7 +20,7 @@ import io.element.android.libraries.matrix.api.core.ThreadId
 
 @ContributesBinding(AppScope::class)
 @Inject
-class DefaultDeeplinkParser: DeeplinkParser {
+class DefaultDeeplinkParser : DeeplinkParser {
     override fun getFromIntent(intent: Intent): DeeplinkData? {
         return intent
             .takeIf { it.action == Intent.ACTION_VIEW }

libraries/di/src/main/kotlin/io/element/android/libraries/di/AppScope.kt

@@ -1,10 +0,0 @@
-/*
- * Copyright 2022-2024 New Vector Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
- * Please see LICENSE files in the repository root for full details.
- */
-
-package io.element.android.libraries.di
-
-abstract class AppScope private constructor()

libraries/matrix/api/build.gradle.kts

@@ -1,5 +1,6 @@
 import config.BuildTimeConfig
 import extension.buildConfigFieldStr
+import extension.setupDependencyInjection
 
 /*
  * Copyright 2022-2024 New Vector Ltd.
@@ -14,6 +15,8 @@ plugins {
     alias(libs.plugins.kotlin.serialization)
 }
 
+setupDependencyInjection()
+
 android {
     namespace = "io.element.android.libraries.matrix.api"
 

libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/mxc/MxcTools.kt

@@ -10,7 +10,7 @@ package io.element.android.libraries.matrix.api.mxc
 import dev.zacsweers.metro.Inject
 
 @Inject
-class MxcTools() {
+class MxcTools {
     /**
      * Regex to match a Matrix Content (mxc://) URI.
      *

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/ClientBuilderProvider.kt

@@ -18,7 +18,7 @@ interface ClientBuilderProvider {
 
 @ContributesBinding(AppScope::class)
 @Inject
-class RustClientBuilderProvider() : ClientBuilderProvider {
+class RustClientBuilderProvider : ClientBuilderProvider {
     override fun provide(): ClientBuilder {
         return ClientBuilder()
     }

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustSdkMetadata.kt

@@ -15,7 +15,7 @@ import org.matrix.rustcomponents.sdk.sdkGitSha
 
 @ContributesBinding(AppScope::class)
 @Inject
-class RustSdkMetadata() : SdkMetadata {
+class RustSdkMetadata : SdkMetadata {
     override val sdkGitSha: String
         get() = sdkGitSha()
 }

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/qrlogin/RustQrCodeLoginDataFactory.kt

@@ -17,7 +17,7 @@ import org.matrix.rustcomponents.sdk.QrCodeData
 
 @ContributesBinding(AppScope::class)
 @Inject
-class RustQrCodeLoginDataFactory() : MatrixQrCodeLoginDataFactory {
+class RustQrCodeLoginDataFactory : MatrixQrCodeLoginDataFactory {
     override fun parseQrCodeData(data: ByteArray): Result<MatrixQrCodeLoginData> {
         return runCatchingExceptions { SdkQrCodeLoginData(QrCodeData.fromBytes(data)) }
     }

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/certificates/DefaultUserCertificatesProvider.kt

@@ -16,7 +16,7 @@ import java.security.KeyStoreException
 
 @ContributesBinding(AppScope::class)
 @Inject
-class DefaultUserCertificatesProvider() : UserCertificatesProvider {
+class DefaultUserCertificatesProvider : UserCertificatesProvider {
     /**
      * Get additional user-installed certificates from the `AndroidCAStore` `Keystore`.
      *

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/keys/DefaultPassphraseGenerator.kt

@@ -17,7 +17,7 @@ private const val SECRET_SIZE = 256
 
 @ContributesBinding(AppScope::class)
 @Inject
-class DefaultPassphraseGenerator() : PassphraseGenerator {
+class DefaultPassphraseGenerator : PassphraseGenerator {
     override fun generatePassphrase(): String? {
         val key = ByteArray(size = SECRET_SIZE)
         SecureRandom().nextBytes(key)

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/permalink/DefaultMatrixToConverter.kt

@@ -21,7 +21,7 @@ import io.element.android.libraries.matrix.api.permalink.MatrixToConverter
  */
 @ContributesBinding(AppScope::class)
 @Inject
-class DefaultMatrixToConverter() : MatrixToConverter {
+class DefaultMatrixToConverter : MatrixToConverter {
     /**
      * Try to convert a URL from an element web instance or from a client permalink to a matrix.to url.
      * To be successfully converted, URL path should contain one of the [SUPPORTED_PATHS].

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/permalink/DefaultPermalinkBuilder.kt

@@ -21,7 +21,7 @@ import org.matrix.rustcomponents.sdk.matrixToUserPermalink
 
 @ContributesBinding(AppScope::class)
 @Inject
-class DefaultPermalinkBuilder() : PermalinkBuilder {
+class DefaultPermalinkBuilder : PermalinkBuilder {
     override fun permalinkForUser(userId: UserId): Result<String> {
         if (!MatrixPatterns.isUserId(userId.value)) {
             return Result.failure(PermalinkBuilderError.InvalidData)

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/platform/RustInitPlatformService.kt

@@ -17,7 +17,7 @@ import org.matrix.rustcomponents.sdk.initPlatform
 
 @ContributesBinding(AppScope::class)
 @Inject
-class RustInitPlatformService() : InitPlatformService {
+class RustInitPlatformService : InitPlatformService {
     override fun init(tracingConfiguration: TracingConfiguration) {
         initPlatform(
             config = tracingConfiguration.map(),

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/TimelineEventTypeFilterFactory.kt

@@ -20,7 +20,7 @@ interface TimelineEventTypeFilterFactory {
 
 @ContributesBinding(AppScope::class)
 @Inject
-class RustTimelineEventTypeFilterFactory() : TimelineEventTypeFilterFactory {
+class RustTimelineEventTypeFilterFactory : TimelineEventTypeFilterFactory {
     override fun create(listStateEventType: List<StateEventType>): TimelineEventTypeFilter {
         return TimelineEventTypeFilter.exclude(
             listStateEventType.map { stateEventType ->

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/alias/DefaultRoomAliasHelper.kt

@@ -15,7 +15,7 @@ import io.element.android.libraries.matrix.api.room.alias.RoomAliasHelper
 
 @ContributesBinding(AppScope::class)
 @Inject
-class DefaultRoomAliasHelper() : RoomAliasHelper {
+class DefaultRoomAliasHelper : RoomAliasHelper {
     override fun roomAliasNameFromRoomDisplayName(name: String): String {
         return org.matrix.rustcomponents.sdk.roomAliasNameFromRoomDisplayName(name)
     }

libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/messages/RoomMemberProfilesCache.kt

@@ -19,7 +19,7 @@ import kotlinx.coroutines.flow.runningFold
 
 @SingleIn(RoomScope::class)
 @Inject
-class RoomMemberProfilesCache() {
+class RoomMemberProfilesCache {
     private val cache = MutableStateFlow(mapOf<UserId, RoomMember>())
     val updateFlow = cache.drop(1).runningFold(0) { acc, _ -> acc + 1 }
 

libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/messages/RoomNamesCache.kt

@@ -20,7 +20,7 @@ import kotlinx.coroutines.flow.runningFold
 
 @SingleIn(RoomScope::class)
 @Inject
-class RoomNamesCache() {
+class RoomNamesCache {
     private val cache = MutableStateFlow(mapOf<RoomIdOrAlias, String?>())
     val updateFlow = cache.drop(1).runningFold(0) { acc, _ -> acc + 1 }
 

libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/DefaultMediaGalleryEntryPoint.kt

@@ -19,7 +19,7 @@ import io.element.android.libraries.mediaviewer.impl.gallery.root.MediaGalleryRo
 
 @ContributesBinding(AppScope::class)
 @Inject
-class DefaultMediaGalleryEntryPoint() : MediaGalleryEntryPoint {
+class DefaultMediaGalleryEntryPoint : MediaGalleryEntryPoint {
     override fun nodeBuilder(parentNode: Node, buildContext: BuildContext): MediaGalleryEntryPoint.NodeBuilder {
         val plugins = ArrayList<Plugin>()
 

libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/DefaultMediaViewerEntryPoint.kt

@@ -23,7 +23,7 @@ import io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerNode
 
 @ContributesBinding(AppScope::class)
 @Inject
-class DefaultMediaViewerEntryPoint() : MediaViewerEntryPoint {
+class DefaultMediaViewerEntryPoint : MediaViewerEntryPoint {
     override fun nodeBuilder(parentNode: Node, buildContext: BuildContext): MediaViewerEntryPoint.NodeBuilder {
         val plugins = ArrayList<Plugin>()
 

libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/MediaItemsPostProcessor.kt

@@ -13,7 +13,7 @@ import io.element.android.libraries.mediaviewer.impl.model.MediaItem
 import kotlinx.collections.immutable.toImmutableList
 
 @Inject
-class MediaItemsPostProcessor() {
+class MediaItemsPostProcessor {
     fun process(
         mediaItems: List<MediaItem>,
     ): GroupedMediaItems {

libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/util/FileExtensionExtractorWithValidation.kt

@@ -15,7 +15,7 @@ import io.element.android.libraries.mediaviewer.api.util.FileExtensionExtractor
 
 @ContributesBinding(AppScope::class)
 @Inject
-class FileExtensionExtractorWithValidation() : FileExtensionExtractor {
+class FileExtensionExtractorWithValidation : FileExtensionExtractor {
     override fun extractFromName(name: String): String {
         val fileExtension = name.substringAfterLast('.', "")
         // Makes sure the extension is known by the system, otherwise default to binary extension.

libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/PagerKeysHandler.kt

@@ -36,7 +36,7 @@ import io.element.android.libraries.mediaviewer.impl.model.eventId
  * (keyOffset = -1)
  */
 @Inject
-class PagerKeysHandler() {
+class PagerKeysHandler {
     private data class Data(
         val mediaItems: List<MediaItem>,
         val keyOffset: Long,

libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/DefaultOidcActionFlow.kt

@@ -19,7 +19,7 @@ import kotlinx.coroutines.flow.MutableStateFlow
 @ContributesBinding(AppScope::class)
 @SingleIn(AppScope::class)
 @Inject
-class DefaultOidcActionFlow() : OidcActionFlow {
+class DefaultOidcActionFlow : OidcActionFlow {
     private val mutableStateFlow = MutableStateFlow<OidcAction?>(null)
 
     override fun post(oidcAction: OidcAction) {

libraries/permissions/impl/src/main/kotlin/io/element/android/libraries/permissions/impl/AccompanistPermissionStateProvider.kt

@@ -24,7 +24,7 @@ interface ComposablePermissionStateProvider {
 
 @ContributesBinding(AppScope::class)
 @Inject
-class AccompanistPermissionStateProvider() : ComposablePermissionStateProvider {
+class AccompanistPermissionStateProvider : ComposablePermissionStateProvider {
     @Composable
     override fun provide(permission: String, onPermissionResult: (Boolean) -> Unit): PermissionState {
         return rememberPermissionState(

libraries/preferences/impl/src/main/kotlin/io/element/android/libraries/preferences/impl/store/DefaultPreferencesDataStoreFactory.kt

@@ -16,7 +16,7 @@ import dev.zacsweers.metro.ContributesBinding
 import dev.zacsweers.metro.Inject
 import dev.zacsweers.metro.SingleIn
 import io.element.android.libraries.androidutils.preferences.DefaultPreferencesCorruptionHandlerFactory
-import io.element.android.libraries.di.ApplicationContext
+import io.element.android.libraries.di.annotations.ApplicationContext
 import io.element.android.libraries.preferences.api.store.PreferenceDataStoreFactory
 import java.util.concurrent.ConcurrentHashMap