Try splitting messages into api and impl modules

2023-03-03 14:38:05 +01:00 · 2023-03-03 14:38:05 +01:00 · a94862d778
commit a94862d778
parent f2fd168a78
115 changed files with 130 additions and 50 deletions
--- a/app/src/main/kotlin/io/element/android/x/ElementXApplication.kt
+++ b/app/src/main/kotlin/io/element/android/x/ElementXApplication.kt
@ -18,9 +18,9 @@ package io.element.android.x

 import android.app.Application
 import androidx.startup.AppInitializer
-import io.element.android.libraries.di.DaggerComponentOwner
 import io.element.android.x.di.AppComponent
 import io.element.android.x.di.DaggerAppComponent
+import io.element.android.libraries.di.DaggerComponentOwner
 import io.element.android.x.info.logApplicationInfo
 import io.element.android.x.initializer.CrashInitializer
 import io.element.android.x.initializer.MatrixInitializer
--- a/app/src/main/kotlin/io/element/android/x/MainActivity.kt
+++ b/app/src/main/kotlin/io/element/android/x/MainActivity.kt
@ -25,10 +25,10 @@ import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.core.view.WindowCompat
 import com.bumble.appyx.core.integration.NodeHost
 import com.bumble.appyx.core.integrationpoint.NodeComponentActivity
+import io.element.android.x.di.AppBindings
 import io.element.android.libraries.architecture.bindings
 import io.element.android.libraries.architecture.createNode
 import io.element.android.libraries.designsystem.theme.ElementTheme
-import io.element.android.x.di.AppBindings
 import io.element.android.x.node.RootFlowNode

 class MainActivity : NodeComponentActivity() {
--- a/app/src/main/kotlin/io/element/android/x/di/AppBindings.kt
+++ b/app/src/main/kotlin/io/element/android/x/di/AppBindings.kt
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 New Vector Ltd
+ * Copyright (c) 2023 New Vector Ltd
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -18,12 +18,8 @@ package io.element.android.x.di

 import com.squareup.anvil.annotations.ContributesTo
 import io.element.android.libraries.di.AppScope
-import io.element.android.libraries.matrix.auth.MatrixAuthenticationService
-import io.element.android.x.root.RootPresenter

@ContributesTo(AppScope::class)
 interface AppBindings {
-    fun rootPresenter(): RootPresenter
-    fun authenticationService(): MatrixAuthenticationService
    fun matrixClientsHolder(): MatrixClientsHolder
 }
--- a/app/src/main/kotlin/io/element/android/x/di/AppComponent.kt
+++ b/app/src/main/kotlin/io/element/android/x/di/AppComponent.kt
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 New Vector Ltd
+ * Copyright (c) 2023 New Vector Ltd
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/app/src/main/kotlin/io/element/android/x/di/AppModule.kt
+++ b/app/src/main/kotlin/io/element/android/x/di/AppModule.kt
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 New Vector Ltd
+ * Copyright (c) 2023 New Vector Ltd
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -20,18 +20,11 @@ import android.content.Context
 import com.squareup.anvil.annotations.ContributesTo
 import dagger.Module
 import dagger.Provides
-import io.element.android.features.rageshake.reporter.BugReporter
-import io.element.android.features.rageshake.reporter.DefaultBugReporter
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
 import io.element.android.libraries.di.AppScope
 import io.element.android.libraries.di.ApplicationContext
 import io.element.android.libraries.di.SingleIn
-import kotlinx.coroutines.CoroutineName
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.MainScope
-import kotlinx.coroutines.asCoroutineDispatcher
-import kotlinx.coroutines.plus
+import kotlinx.coroutines.*
 import java.io.File
 import java.util.concurrent.Executors

@ -61,6 +54,4 @@ object AppModule {
        )
    }

-    @Provides
-    fun providesBugReporter(bugReporter: DefaultBugReporter): BugReporter = bugReporter
 }
--- a/app/src/main/kotlin/io/element/android/x/di/MatrixClientsHolder.kt
+++ b/app/src/main/kotlin/io/element/android/x/di/MatrixClientsHolder.kt
@ -28,7 +28,6 @@ import java.util.concurrent.ConcurrentHashMap
 import javax.inject.Inject

 private const val SAVE_INSTANCE_KEY = "io.element.android.x.di.MatrixClientsHolder.SaveInstanceKey"
-
@SingleIn(AppScope::class)
 class MatrixClientsHolder @Inject constructor(private val authenticationService: MatrixAuthenticationService) {

--- a/app/src/main/kotlin/io/element/android/x/di/RoomComponent.kt
+++ b/app/src/main/kotlin/io/element/android/x/di/RoomComponent.kt
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 New Vector Ltd
+ * Copyright (c) 2023 New Vector Ltd
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/app/src/main/kotlin/io/element/android/x/di/SessionComponent.kt
+++ b/app/src/main/kotlin/io/element/android/x/di/SessionComponent.kt
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 New Vector Ltd
+ * Copyright (c) 2023 New Vector Ltd
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/app/src/main/kotlin/io/element/android/x/node/RoomFlowNode.kt
+++ b/app/src/main/kotlin/io/element/android/x/node/RoomFlowNode.kt
@ -28,6 +28,7 @@ import com.bumble.appyx.navmodel.backstack.BackStack
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
 import io.element.android.anvilannotations.ContributesNode
+import io.element.android.x.di.RoomComponent
 import io.element.android.features.messages.api.MessagesEntryPoint
 import io.element.android.libraries.architecture.BackstackNode
 import io.element.android.libraries.architecture.NodeInputs
@ -36,7 +37,6 @@ import io.element.android.libraries.architecture.nodeInputs
 import io.element.android.libraries.di.DaggerComponentOwner
 import io.element.android.libraries.di.SessionScope
 import io.element.android.libraries.matrix.room.MatrixRoom
-import io.element.android.x.di.RoomComponent
 import kotlinx.parcelize.Parcelize
 import timber.log.Timber

--- a/app/src/main/kotlin/io/element/android/x/node/RootFlowNode.kt
+++ b/app/src/main/kotlin/io/element/android/x/node/RootFlowNode.kt
@ -36,8 +36,8 @@ import com.bumble.appyx.navmodel.backstack.operation.push
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
 import io.element.android.anvilannotations.ContributesNode
+import io.element.android.x.root.MatrixClientsHolder
 import io.element.android.features.rageshake.bugreport.BugReportEntryPoint
-import io.element.android.features.rageshake.bugreport.BugReportNode
 import io.element.android.libraries.architecture.BackstackNode
 import io.element.android.libraries.architecture.animation.rememberDefaultTransitionHandler
 import io.element.android.libraries.architecture.createNode
@ -48,7 +48,6 @@ import io.element.android.libraries.di.ApplicationContext
 import io.element.android.libraries.di.DaggerComponentOwner
 import io.element.android.libraries.matrix.auth.MatrixAuthenticationService
 import io.element.android.libraries.matrix.core.SessionId
-import io.element.android.x.di.MatrixClientsHolder
 import io.element.android.x.root.RootPresenter
 import io.element.android.x.root.RootView
 import kotlinx.coroutines.flow.distinctUntilChanged
--- a/app/src/main/kotlin/io/element/android/x/root/MatrixClientsHolder.kt
+++ b/app/src/main/kotlin/io/element/android/x/root/MatrixClientsHolder.kt
@ -0,0 +1,63 @@
+package io.element.android.x.root
+
+import android.os.Bundle
+import io.element.android.libraries.di.AppScope
+import io.element.android.libraries.di.SingleIn
+import io.element.android.libraries.matrix.MatrixClient
+import io.element.android.libraries.matrix.auth.MatrixAuthenticationService
+import io.element.android.libraries.matrix.core.SessionId
+import kotlinx.coroutines.runBlocking
+import timber.log.Timber
+import java.util.concurrent.ConcurrentHashMap
+import javax.inject.Inject
+
+private const val SAVE_INSTANCE_KEY = "io.element.android.x.di.MatrixClientsHolder.SaveInstanceKey"
+
+@SingleIn(AppScope::class)
+class MatrixClientsHolder @Inject constructor(private val authenticationService: MatrixAuthenticationService) {
+
+    private val sessionIdsToMatrixClient = ConcurrentHashMap<SessionId, MatrixClient>()
+
+    fun add(matrixClient: MatrixClient) {
+        sessionIdsToMatrixClient[matrixClient.sessionId] = matrixClient
+    }
+
+    fun removeAll() {
+        sessionIdsToMatrixClient.clear()
+    }
+
+    fun remove(sessionId: SessionId) {
+        sessionIdsToMatrixClient.remove(sessionId)
+    }
+
+    fun isEmpty(): Boolean = sessionIdsToMatrixClient.isEmpty()
+
+    fun knowSession(sessionId: SessionId): Boolean = sessionIdsToMatrixClient.containsKey(sessionId)
+
+    fun getOrNull(sessionId: SessionId): MatrixClient? {
+        return sessionIdsToMatrixClient[sessionId]
+    }
+
+    @Suppress("DEPRECATION")
+    fun restore(savedInstanceState: Bundle?) {
+        if (savedInstanceState == null || sessionIdsToMatrixClient.isNotEmpty()) return
+        val sessionIds = savedInstanceState.getSerializable(SAVE_INSTANCE_KEY) as? Array<SessionId>
+        if (sessionIds.isNullOrEmpty()) return
+        // Not ideal but should only happens in case of process recreation. This ensure we restore all the active sessions before restoring the node graphs.
+        runBlocking {
+            sessionIds.forEach { sessionId ->
+                Timber.v("Restore matrix session: $sessionId")
+                val matrixClient = authenticationService.restoreSession(sessionId)
+                if (matrixClient != null) {
+                    add(matrixClient)
+                }
+            }
+        }
+    }
+
+    fun onSaveInstanceState(outState: Bundle) {
+        val sessionKeys = sessionIdsToMatrixClient.keys.toTypedArray()
+        Timber.v("Save matrix session keys = $sessionKeys")
+        outState.putSerializable(SAVE_INSTANCE_KEY, sessionKeys)
+    }
+}