DROID-2899 Multiplayer | Enhancement | Support deeplink to object with invite to shared space

app/src/main/java/com/anytypeio/anytype/di/feature/MainEntryDI.kt

@@ -1,6 +1,7 @@
 package com.anytypeio.anytype.di.feature
 
 import com.anytypeio.anytype.analytics.base.Analytics
+import com.anytypeio.anytype.core_utils.di.scope.PerDialog
 import com.anytypeio.anytype.core_utils.di.scope.PerScreen
 import com.anytypeio.anytype.domain.account.AccountStatusChannel
 import com.anytypeio.anytype.domain.account.AwaitAccountStartManager
@@ -14,6 +15,8 @@ import com.anytypeio.anytype.domain.config.ConfigStorage
 import com.anytypeio.anytype.domain.config.UserSettingsRepository
 import com.anytypeio.anytype.domain.device.PathProvider
 import com.anytypeio.anytype.domain.misc.LocaleProvider
+import com.anytypeio.anytype.domain.multiplayer.SpaceInviteResolver
+import com.anytypeio.anytype.domain.multiplayer.SpaceViewSubscriptionContainer
 import com.anytypeio.anytype.domain.notifications.SystemNotificationService
 import com.anytypeio.anytype.domain.platform.InitialParamsProvider
 import com.anytypeio.anytype.domain.subscriptions.GlobalSubscriptionManager
@@ -22,6 +25,7 @@ import com.anytypeio.anytype.domain.wallpaper.ObserveWallpaper
 import com.anytypeio.anytype.domain.wallpaper.RestoreWallpaper
 import com.anytypeio.anytype.domain.wallpaper.WallpaperStore
 import com.anytypeio.anytype.domain.workspace.SpaceManager
+import com.anytypeio.anytype.other.DefaultSpaceInviteResolver
 import com.anytypeio.anytype.presentation.main.MainViewModelFactory
 import com.anytypeio.anytype.presentation.membership.provider.MembershipProvider
 import com.anytypeio.anytype.presentation.navigation.DeepLinkToObjectDelegate
@@ -70,7 +74,8 @@ object MainEntryModule {
         deepLinkToObjectDelegate: DeepLinkToObjectDelegate,
         awaitAccountStartManager: AwaitAccountStartManager,
         membershipProvider: MembershipProvider,
-        globalSubscriptionManager: GlobalSubscriptionManager
+        globalSubscriptionManager: GlobalSubscriptionManager,
+        spaceInviteResolver: SpaceInviteResolver
     ): MainViewModelFactory = MainViewModelFactory(
         resumeAccount = resumeAccount,
         analytics = analytics,
@@ -87,7 +92,8 @@ object MainEntryModule {
         deepLinkToObjectDelegate = deepLinkToObjectDelegate,
         awaitAccountStartManager = awaitAccountStartManager,
         membershipProvider = membershipProvider,
-        globalSubscriptionManager = globalSubscriptionManager
+        globalSubscriptionManager = globalSubscriptionManager,
+        spaceInviteResolver = spaceInviteResolver
     )
 
     @JvmStatic
@@ -192,4 +198,9 @@ object MainEntryModule {
     fun provideDeepLinkToObjectDelegate(
         default: DeepLinkToObjectDelegate.Default
     ): DeepLinkToObjectDelegate = default
+
+    @JvmStatic
+    @PerScreen
+    @Provides
+    fun provideSpaceInviteResolver(): SpaceInviteResolver = DefaultSpaceInviteResolver
 }

app/src/main/java/com/anytypeio/anytype/di/feature/ObjectMenuDI.kt

@@ -15,6 +15,8 @@ import com.anytypeio.anytype.domain.dashboard.interactor.SetObjectListIsFavorite
 import com.anytypeio.anytype.domain.misc.DateProvider
 import com.anytypeio.anytype.domain.misc.DeepLinkResolver
 import com.anytypeio.anytype.domain.misc.UrlBuilder
+import com.anytypeio.anytype.domain.multiplayer.GetSpaceInviteLink
+import com.anytypeio.anytype.domain.multiplayer.SpaceViewSubscriptionContainer
 import com.anytypeio.anytype.domain.`object`.DuplicateObject
 import com.anytypeio.anytype.domain.`object`.SetObjectDetails
 import com.anytypeio.anytype.domain.objects.SetObjectListIsArchived
@@ -119,7 +121,9 @@ object ObjectMenuModule {
         payloadDelegator: PayloadDelegator,
         setObjectListIsFavorite: SetObjectListIsFavorite,
         setObjectIsArchived: SetObjectListIsArchived,
-        fieldParser: FieldParser
+        fieldParser: FieldParser,
+        spaceViewSubscriptionContainer: SpaceViewSubscriptionContainer,
+        getSpaceInviteLink: GetSpaceInviteLink
     ): ObjectMenuViewModel.Factory = ObjectMenuViewModel.Factory(
         setObjectIsArchived = setObjectIsArchived,
         duplicateObject = duplicateObject,
@@ -142,7 +146,9 @@ object ObjectMenuModule {
         analyticSpaceHelperDelegate = analyticSpaceHelperDelegate,
         payloadDelegator = payloadDelegator,
         setObjectListIsFavorite = setObjectListIsFavorite,
-        fieldParser = fieldParser
+        fieldParser = fieldParser,
+        getSpaceInviteLink = getSpaceInviteLink,
+        spaceViewSubscriptionContainer = spaceViewSubscriptionContainer
     )
 
     @JvmStatic
@@ -237,6 +243,8 @@ object ObjectSetMenuModule {
         setObjectListIsFavorite: SetObjectListIsFavorite,
         setObjectIsArchived: SetObjectListIsArchived,
         fieldParser: FieldParser,
+        getSpaceInviteLink: GetSpaceInviteLink,
+        spaceViewSubscriptionContainer: SpaceViewSubscriptionContainer
     ): ObjectSetMenuViewModel.Factory = ObjectSetMenuViewModel.Factory(
         setObjectListIsArchived = setObjectIsArchived,
         addBackLinkToObject = addBackLinkToObject,
@@ -255,7 +263,9 @@ object ObjectSetMenuModule {
         analyticSpaceHelperDelegate = analyticSpaceHelperDelegate,
         payloadDelegator = payloadDelegator,
         setObjectListIsFavorite = setObjectListIsFavorite,
-        fieldParser = fieldParser
+        fieldParser = fieldParser,
+        getSpaceInviteLink = getSpaceInviteLink,
+        spaceViewSubscriptionContainer = spaceViewSubscriptionContainer
     )
 
     @JvmStatic

app/src/main/java/com/anytypeio/anytype/di/feature/home/HomescreenDI.kt

@@ -22,6 +22,7 @@ import com.anytypeio.anytype.domain.misc.AppActionManager
 import com.anytypeio.anytype.domain.misc.DateProvider
 import com.anytypeio.anytype.domain.misc.UrlBuilder
 import com.anytypeio.anytype.domain.multiplayer.ActiveSpaceMemberSubscriptionContainer
+import com.anytypeio.anytype.domain.multiplayer.SpaceInviteResolver
 import com.anytypeio.anytype.domain.multiplayer.SpaceViewSubscriptionContainer
 import com.anytypeio.anytype.domain.multiplayer.UserPermissionProvider
 import com.anytypeio.anytype.domain.`object`.GetObject
@@ -38,6 +39,7 @@ import com.anytypeio.anytype.domain.search.SubscriptionEventChannel
 import com.anytypeio.anytype.domain.templates.GetTemplates
 import com.anytypeio.anytype.domain.workspace.NotificationsChannel
 import com.anytypeio.anytype.domain.workspace.SpaceManager
+import com.anytypeio.anytype.other.DefaultSpaceInviteResolver
 import com.anytypeio.anytype.presentation.analytics.AnalyticSpaceHelperDelegate
 import com.anytypeio.anytype.presentation.common.PayloadDelegator
 import com.anytypeio.anytype.presentation.editor.cover.CoverImageHashProvider
@@ -207,6 +209,11 @@ object HomeScreenModule {
     @PerScreen
     fun coverHashProvider() : CoverImageHashProvider = DefaultCoverImageHashProvider()
 
+    @JvmStatic
+    @PerScreen
+    @Provides
+    fun provideSpaceInviteResolver(): SpaceInviteResolver = DefaultSpaceInviteResolver
+
     @Module
     interface Declarations {
         @PerScreen

app/src/main/java/com/anytypeio/anytype/di/feature/vault/VaultDI.kt

@@ -2,6 +2,7 @@ package com.anytypeio.anytype.di.feature.vault
 
 import androidx.lifecycle.ViewModelProvider
 import com.anytypeio.anytype.analytics.base.Analytics
+import com.anytypeio.anytype.core_utils.di.scope.PerDialog
 import com.anytypeio.anytype.core_utils.di.scope.PerScreen
 import com.anytypeio.anytype.di.common.ComponentDependencies
 import com.anytypeio.anytype.domain.account.AwaitAccountStartManager
@@ -12,15 +13,18 @@ import com.anytypeio.anytype.domain.config.UserSettingsRepository
 import com.anytypeio.anytype.domain.debugging.Logger
 import com.anytypeio.anytype.domain.misc.AppActionManager
 import com.anytypeio.anytype.domain.misc.UrlBuilder
+import com.anytypeio.anytype.domain.multiplayer.SpaceInviteResolver
 import com.anytypeio.anytype.domain.multiplayer.SpaceViewSubscriptionContainer
 import com.anytypeio.anytype.domain.multiplayer.UserPermissionProvider
 import com.anytypeio.anytype.domain.workspace.SpaceManager
+import com.anytypeio.anytype.other.DefaultSpaceInviteResolver
 import com.anytypeio.anytype.presentation.navigation.DeepLinkToObjectDelegate
 import com.anytypeio.anytype.presentation.vault.VaultViewModel
 import com.anytypeio.anytype.ui.vault.VaultFragment
 import dagger.Binds
 import dagger.Component
 import dagger.Module
+import dagger.Provides
 
 @Component(
     dependencies = [VaultComponentDependencies::class],
@@ -56,6 +60,10 @@ object VaultModule {
             default: DeepLinkToObjectDelegate.Default
         ) : DeepLinkToObjectDelegate
     }
+
+    @PerScreen
+    @Provides
+    fun provideSpaceInviteResolver() : SpaceInviteResolver = DefaultSpaceInviteResolver
 }
 
 interface VaultComponentDependencies : ComponentDependencies {

app/src/main/java/com/anytypeio/anytype/other/Deeplinks.kt

@@ -9,6 +9,8 @@ import com.anytypeio.anytype.domain.multiplayer.SpaceInviteResolver
 
 const val DEEP_LINK_PATTERN = "anytype://"
 
+const val DEEP_LINK_INVITE_DOMAIN = "invite.any.coop"
+
 /**
  * Regex pattern for matching
  */
@@ -25,6 +27,8 @@ const val MEMBERSHIP_PATH = "membership"
 const val TYPE_PARAM = "type"
 const val OBJECT_ID_PARAM = "objectId"
 const val SPACE_ID_PARAM = "spaceId"
+const val CONTENT_ID_PARAM = "cid"
+const val ENCRYPTION_KEY_PARAM = "key"
 const val SOURCE_PARAM = "source"
 const val TYPE_VALUE_EXPERIENCE = "experience"
 const val TIER_ID_PARAM = "tier"
@@ -61,9 +65,19 @@ object DefaultDeepLinkResolver : DeepLinkResolver {
             val obj = uri.getQueryParameter(OBJECT_ID_PARAM)
             val space = uri.getQueryParameter(SPACE_ID_PARAM)
             if (!obj.isNullOrEmpty() && !space.isNullOrEmpty()) {
+                val cid = uri.getQueryParameter(CONTENT_ID_PARAM)
+                val key = uri.getQueryParameter(ENCRYPTION_KEY_PARAM)
                 DeepLinkResolver.Action.DeepLinkToObject(
                     obj = obj,
-                    space = SpaceId(space)
+                    space = SpaceId(space),
+                    invite = if (!cid.isNullOrEmpty() && !key.isNullOrEmpty()) {
+                        DeepLinkResolver.Action.DeepLinkToObject.Invite(
+                            cid = cid,
+                            key = key
+                        )
+                    } else {
+                        null
+                    }
                 )
             } else {
                 DeepLinkResolver.Action.Unknown
@@ -82,6 +96,15 @@ object DefaultDeepLinkResolver : DeepLinkResolver {
         return "${DEEP_LINK_PATTERN}${OBJECT_PATH}?${OBJECT_ID_PARAM}=$obj&${SPACE_ID_PARAM}=${space.id}"
     }
 
+    override fun createObjectDeepLinkWithInvite(
+        obj: Id,
+        space: SpaceId,
+        invite: Id,
+        encryptionKey: String
+    ): Url {
+        return "${DEEP_LINK_PATTERN}${OBJECT_PATH}?${OBJECT_ID_PARAM}=$obj&${SPACE_ID_PARAM}=${space.id}&${DefaultSpaceInviteResolver.CONTENT_ID_KEY}=$invite&${DefaultSpaceInviteResolver.FILE_KEY_KEY}=$encryptionKey"
+    }
+
     override fun isDeepLink(link: String): Boolean {
         return link.contains(defaultInviteRegex) || link.contains(DEEP_LINK_PATTERN)
     }
@@ -112,8 +135,12 @@ object DefaultSpaceInviteResolver : SpaceInviteResolver {
         }
     }
 
+    override fun createInviteLink(contentId: String, encryptionKey: String) : String {
+        return "https://$DEEP_LINK_INVITE_DOMAIN/$contentId#$encryptionKey"
+    }
+
     private const val CONTENT_INDEX = 1
     private const val KEY_INDEX = 2
-    private const val CONTENT_ID_KEY = "cid"
-    private const val FILE_KEY_KEY = "key"
+    const val CONTENT_ID_KEY = "cid"
+    const val FILE_KEY_KEY = "key"
 }

domain/src/main/java/com/anytypeio/anytype/domain/misc/DeepLinkResolver.kt

@@ -11,6 +11,13 @@ interface DeepLinkResolver {
 
     fun createObjectDeepLink(obj: Id, space: SpaceId) : Url
 
+    fun createObjectDeepLinkWithInvite(
+        obj: Id,
+        space: SpaceId,
+        invite: Id,
+        encryptionKey: String
+    ) : Url
+
     fun isDeepLink(link: String) : Boolean
 
     sealed class Action {
@@ -21,8 +28,14 @@ interface DeepLinkResolver {
         data class Invite(val link: String) : Action()
         data class DeepLinkToObject(
             val obj: Id,
-            val space: SpaceId
-        ) : Action()
+            val space: SpaceId,
+            val invite: Invite? = null
+        ) : Action() {
+            data class Invite(
+                val cid: String,
+                val key: String
+            )
+        }
         data class DeepLinkToMembership(
             val tierId: String?
         ) : Action()

domain/src/main/java/com/anytypeio/anytype/domain/multiplayer/SpaceInviteResolver.kt

@@ -5,4 +5,5 @@ import com.anytypeio.anytype.core_models.Id
 interface SpaceInviteResolver {
     fun parseContentId(link: String) : Id?
     fun parseFileKey(link: String) : Id?
+    fun createInviteLink(contentId: String, encryptionKey: String) : String
 }

presentation/src/main/java/com/anytypeio/anytype/presentation/home/HomeScreenViewModel.kt

@@ -54,6 +54,7 @@ import com.anytypeio.anytype.domain.misc.DateProvider
 import com.anytypeio.anytype.domain.misc.DeepLinkResolver
 import com.anytypeio.anytype.domain.misc.Reducer
 import com.anytypeio.anytype.domain.misc.UrlBuilder
+import com.anytypeio.anytype.domain.multiplayer.SpaceInviteResolver
 import com.anytypeio.anytype.domain.multiplayer.UserPermissionProvider
 import com.anytypeio.anytype.domain.`object`.GetObject
 import com.anytypeio.anytype.domain.`object`.OpenObject
@@ -207,7 +208,8 @@ class HomeScreenViewModel(
     private val clearLastOpenedObject: ClearLastOpenedObject,
     private val spaceBinWidgetContainer: SpaceBinWidgetContainer,
     private val featureToggles: FeatureToggles,
-    private val fieldParser: FieldParser
+    private val fieldParser: FieldParser,
+    private val spaceInviteResolver: SpaceInviteResolver
 ) : NavigationViewModel<HomeScreenViewModel.Navigation>(),
     Reducer<ObjectView, Payload>,
     WidgetActiveViewStateHolder by widgetActiveViewStateHolder,
@@ -1339,7 +1341,19 @@ class HomeScreenViewModel(
                     ).collect { result ->
                         when(result) {
                             is DeepLinkToObjectDelegate.Result.Error -> {
-                                commands.emit(Command.Deeplink.DeepLinkToObjectNotWorking)
+                                val link = deeplink.invite
+                                if (link != null) {
+                                    commands.emit(
+                                        Command.Deeplink.Invite(
+                                            link = spaceInviteResolver.createInviteLink(
+                                                contentId = link.cid,
+                                                encryptionKey = link.key
+                                            )
+                                        )
+                                    )
+                                } else {
+                                    commands.emit(Command.Deeplink.DeepLinkToObjectNotWorking)
+                                }
                             }
                             is DeepLinkToObjectDelegate.Result.Success -> {
                                 proceedWithNavigation(result.obj.navigation())
@@ -2196,7 +2210,8 @@ class HomeScreenViewModel(
         private val clearLastOpenedObject: ClearLastOpenedObject,
         private val spaceBinWidgetContainer: SpaceBinWidgetContainer,
         private val featureToggles: FeatureToggles,
-        private val fieldParser: FieldParser
+        private val fieldParser: FieldParser,
+        private val spaceInviteResolver: SpaceInviteResolver
     ) : ViewModelProvider.Factory {
         @Suppress("UNCHECKED_CAST")
         override fun <T : ViewModel> create(modelClass: Class<T>): T = HomeScreenViewModel(
@@ -2248,7 +2263,8 @@ class HomeScreenViewModel(
             clearLastOpenedObject = clearLastOpenedObject,
             spaceBinWidgetContainer = spaceBinWidgetContainer,
             featureToggles = featureToggles,
-            fieldParser = fieldParser
+            fieldParser = fieldParser,
+            spaceInviteResolver = spaceInviteResolver
         ) as T
     }
 

presentation/src/main/java/com/anytypeio/anytype/presentation/main/MainViewModel.kt

@@ -24,6 +24,7 @@ import com.anytypeio.anytype.domain.base.Interactor
 import com.anytypeio.anytype.domain.config.ConfigStorage
 import com.anytypeio.anytype.domain.misc.DeepLinkResolver
 import com.anytypeio.anytype.domain.misc.LocaleProvider
+import com.anytypeio.anytype.domain.multiplayer.SpaceInviteResolver
 import com.anytypeio.anytype.domain.notifications.SystemNotificationService
 import com.anytypeio.anytype.domain.subscriptions.GlobalSubscriptionManager
 import com.anytypeio.anytype.domain.wallpaper.ObserveWallpaper
@@ -62,7 +63,8 @@ class MainViewModel(
     private val deepLinkToObjectDelegate: DeepLinkToObjectDelegate,
     private val awaitAccountStartManager: AwaitAccountStartManager,
     private val membershipProvider: MembershipProvider,
-    private val globalSubscriptionManager: GlobalSubscriptionManager
+    private val globalSubscriptionManager: GlobalSubscriptionManager,
+    private val spaceInviteResolver: SpaceInviteResolver
 ) : ViewModel(),
     NotificationActionDelegate by notificationActionDelegate,
     DeepLinkToObjectDelegate by deepLinkToObjectDelegate {
@@ -336,7 +338,19 @@ class MainViewModel(
                 )
                 when (result) {
                     is DeepLinkToObjectDelegate.Result.Error -> {
-                        toasts.emit("Error: $result")
+                        val link = deeplink.invite
+                        if (link != null) {
+                            commands.emit(
+                                Command.Deeplink.Invite(
+                                    spaceInviteResolver.createInviteLink(
+                                        contentId = link.cid,
+                                        encryptionKey = link.key
+                                    )
+                                )
+                            )
+                        } else {
+                            toasts.emit("Error: $result")
+                        }
                     }
                     is DeepLinkToObjectDelegate.Result.Success -> {
                         commands.emit(