Merge branch 'develop' into feature/fga/message_queuing

appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt

@@ -16,6 +16,7 @@
 
 package io.element.android.appnav
 
+import android.content.Intent
 import android.os.Parcelable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.runtime.Composable
@@ -55,6 +56,7 @@ import io.element.android.features.roomdirectory.api.RoomDescription
 import io.element.android.features.roomdirectory.api.RoomDirectoryEntryPoint
 import io.element.android.features.roomlist.api.RoomListEntryPoint
 import io.element.android.features.securebackup.api.SecureBackupEntryPoint
+import io.element.android.features.share.api.ShareEntryPoint
 import io.element.android.features.userprofile.api.UserProfileEntryPoint
 import io.element.android.libraries.architecture.BackstackView
 import io.element.android.libraries.architecture.BaseFlowNode
@@ -99,6 +101,7 @@ class LoggedInFlowNode @AssistedInject constructor(
     private val networkMonitor: NetworkMonitor,
     private val ftueService: FtueService,
     private val roomDirectoryEntryPoint: RoomDirectoryEntryPoint,
+    private val shareEntryPoint: ShareEntryPoint,
     private val matrixClient: MatrixClient,
     private val sendingQueue: SendingQueue,
     snackbarDispatcher: SnackbarDispatcher,
@@ -226,6 +229,9 @@ class LoggedInFlowNode @AssistedInject constructor(
 
         @Parcelize
         data object RoomDirectorySearch : NavTarget
+
+        @Parcelize
+        data class IncomingShare(val intent: Intent) : NavTarget
     }
 
     override fun resolve(navTarget: NavTarget, buildContext: BuildContext): Node {
@@ -382,6 +388,20 @@ class LoggedInFlowNode @AssistedInject constructor(
                     })
                     .build()
             }
+            is NavTarget.IncomingShare -> {
+                shareEntryPoint.nodeBuilder(this, buildContext)
+                    .callback(object : ShareEntryPoint.Callback {
+                        override fun onDone(roomIds: List<RoomId>) {
+                            navigateUp()
+                            if (roomIds.size == 1) {
+                                val targetRoomId = roomIds.first()
+                                backstack.push(NavTarget.Room(targetRoomId.toRoomIdOrAlias()))
+                            }
+                        }
+                    })
+                    .params(ShareEntryPoint.Params(intent = navTarget.intent))
+                    .build()
+            }
         }
     }
 
@@ -421,6 +441,17 @@ class LoggedInFlowNode @AssistedInject constructor(
         }
     }
 
+    internal suspend fun attachIncomingShare(intent: Intent) {
+        waitForNavTargetAttached { navTarget ->
+            navTarget is NavTarget.RoomList
+        }
+        attachChild<Node> {
+            backstack.push(
+                NavTarget.IncomingShare(intent)
+            )
+        }
+    }
+
     @Composable
     override fun View(modifier: Modifier) {
         Box(modifier = modifier) {

appnav/src/main/kotlin/io/element/android/appnav/RootFlowNode.kt

@@ -283,6 +283,19 @@ class RootFlowNode @AssistedInject constructor(
             is ResolvedIntent.Navigation -> navigateTo(resolvedIntent.deeplinkData)
             is ResolvedIntent.Oidc -> onOidcAction(resolvedIntent.oidcAction)
             is ResolvedIntent.Permalink -> navigateTo(resolvedIntent.permalinkData)
+            is ResolvedIntent.IncomingShare -> onIncomingShare(resolvedIntent.intent)
+        }
+    }
+
+    private suspend fun onIncomingShare(intent: Intent) {
+        // Is there a session already?
+        val latestSessionId = authenticationService.getLatestSessionId()
+        if (latestSessionId == null) {
+            // No session, open login
+            switchToNotLoggedInFlow()
+        } else {
+            attachSession(latestSessionId)
+                .attachIncomingShare(intent)
         }
     }
 

appnav/src/main/kotlin/io/element/android/appnav/intent/IntentResolver.kt

@@ -30,6 +30,7 @@ sealed interface ResolvedIntent {
     data class Navigation(val deeplinkData: DeeplinkData) : ResolvedIntent
     data class Oidc(val oidcAction: OidcAction) : ResolvedIntent
     data class Permalink(val permalinkData: PermalinkData) : ResolvedIntent
+    data class IncomingShare(val intent: Intent) : ResolvedIntent
 }
 
 class IntentResolver @Inject constructor(
@@ -56,6 +57,10 @@ class IntentResolver @Inject constructor(
             ?.takeIf { it !is PermalinkData.FallbackLink }
         if (permalinkData != null) return ResolvedIntent.Permalink(permalinkData)
 
+        if (intent.action == Intent.ACTION_SEND || intent.action == Intent.ACTION_SEND_MULTIPLE) {
+            return ResolvedIntent.IncomingShare(intent)
+        }
+
         // Unknown intent
         Timber.w("Unknown intent")
         return null

appnav/src/main/kotlin/io/element/android/appnav/root/RootPresenter.kt

@@ -23,6 +23,7 @@ import androidx.compose.runtime.getValue
 import im.vector.app.features.analytics.plan.SuperProperties
 import io.element.android.features.rageshake.api.crash.CrashDetectionPresenter
 import io.element.android.features.rageshake.api.detection.RageshakeDetectionPresenter
+import io.element.android.features.share.api.ShareService
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.matrix.api.SdkMetadata
 import io.element.android.services.analytics.api.AnalyticsService
@@ -34,6 +35,7 @@ class RootPresenter @Inject constructor(
     private val rageshakeDetectionPresenter: RageshakeDetectionPresenter,
     private val appErrorStateService: AppErrorStateService,
     private val analyticsService: AnalyticsService,
+    private val shareService: ShareService,
     private val sdkMetadata: SdkMetadata,
 ) : Presenter<RootState> {
     @Composable
@@ -52,6 +54,10 @@ class RootPresenter @Inject constructor(
             )
         }
 
+        LaunchedEffect(Unit) {
+            shareService.observeFeatureFlag(this)
+        }
+
         return RootState(
             rageshakeDetectionState = rageshakeDetectionState,
             crashDetectionState = crashDetectionState,