anyproto/anytype-kotlin
1
0
Fork 0
mirror of https://github.com/anyproto/anytype-kotlin.git synced 2025-06-08 05:47:05 +09:00
Code Activity

DROID-3001 App | Tech | Refactoring - provide space (#1764)

Browse source
This commit is contained in:
Evgenii Kozlov 2024-11-05 11:30:56 +01:00 • committed by Evgenii Kozlov
parent 3536f4535b
commit d60a10f115
30 changed files with 351 additions and 132 deletions
Download patch file Download diff file Expand all files Collapse all files

33
middleware/src/main/java/com/anytypeio/anytype/middleware/block/BlockMiddleware.kt
View file

@ -37,6 +37,7 @@ import com.anytypeio.anytype.core_models.membership.MembershipTierData
import com.anytypeio.anytype.core_models.multiplayer.SpaceInviteLink
import com.anytypeio.anytype.core_models.multiplayer.SpaceInviteView
import com.anytypeio.anytype.core_models.multiplayer.SpaceMemberPermissions
import com.anytypeio.anytype.core_models.primitives.Space
import com.anytypeio.anytype.core_models.primitives.SpaceId
import com.anytypeio.anytype.data.auth.repo.block.BlockRemote
import com.anytypeio.anytype.middleware.interactor.Middleware
@ -46,20 +47,28 @@ class BlockMiddleware(
private val middleware: Middleware
) : BlockRemote {
override suspend fun closeDashboard(id: String) {
middleware.objectClose(id)
}
override suspend fun openObject(id: Id, space: SpaceId): ObjectView = middleware.objectOpen(id = id, space = space)
override suspend fun getObject(id: Id, space: SpaceId): ObjectView = middleware.objectShow(id = id, space = space)
override suspend fun openObject(id: Id): ObjectView = middleware.objectOpen(id = id)
override suspend fun getObject(id: Id): ObjectView = middleware.objectShow(id = id)
override suspend fun openPage(id: String, space: SpaceId): Payload = middleware.objectOpenOld(
id = id,
space = space
)
override suspend fun openProfile(id: String, space: SpaceId): Payload = middleware.objectOpenOld(
id = id,
space = space
)
override suspend fun openObjectSet(id: String, space: SpaceId): Payload = middleware.objectOpenOld(
id = id,
space = space
)
override suspend fun openObjectPreview(id: Id, space: SpaceId): Payload = middleware.objectShowOld(
id = id,
space = space
)
override suspend fun openPage(id: String): Payload = middleware.objectOpenOld(id)
override suspend fun openProfile(id: String): Payload = middleware.objectOpenOld(id)
override suspend fun openObjectSet(id: String): Payload = middleware.objectOpenOld(id)
override suspend fun openObjectPreview(id: Id): Payload = middleware.objectShowOld(id)
override suspend fun closePage(id: String) {
middleware.objectClose(id)
override suspend fun closePage(id: String, space: Space) {
middleware.objectClose(id = id, space = space)
}
override suspend fun updateDocumentTitle(command: Command.UpdateTitle) {

21
middleware/src/main/java/com/anytypeio/anytype/middleware/interactor/Middleware.kt
View file

@ -43,6 +43,7 @@ import com.anytypeio.anytype.core_models.membership.MembershipTierData
import com.anytypeio.anytype.core_models.multiplayer.SpaceInviteLink
import com.anytypeio.anytype.core_models.multiplayer.SpaceInviteView
import com.anytypeio.anytype.core_models.multiplayer.SpaceMemberPermissions
import com.anytypeio.anytype.core_models.primitives.Space
import com.anytypeio.anytype.core_models.primitives.SpaceId
import com.anytypeio.anytype.core_utils.tools.ThreadInfo
import com.anytypeio.anytype.middleware.BuildConfig
@ -848,8 +849,8 @@ class Middleware @Inject constructor(
}
@Throws(Exception::class)
fun objectClose(id: String) {
val request = Rpc.Object.Close.Request(objectId = id)
fun objectClose(id: String, space: Space) {
val request = Rpc.Object.Close.Request(objectId = id, spaceId = space.id)
logRequestIfDebug(request)
val (response, time) = measureTimedValue { service.objectClose(request) }
logResponseIfDebug(response, time)
@ -1091,8 +1092,8 @@ class Middleware @Inject constructor(
}
@Throws(Exception::class)
fun objectOpenOld(id: String): Payload {
val request = Rpc.Object.Open.Request(objectId = id)
fun objectOpenOld(id: String, space: SpaceId): Payload {
val request = Rpc.Object.Open.Request(objectId = id, spaceId = space.id)
logRequestIfDebug(request)
val (response, time) = measureTimedValue { service.objectOpen(request) }
logResponseIfDebug(response, time)
@ -1102,8 +1103,8 @@ class Middleware @Inject constructor(
}
@Throws(Exception::class)
fun objectOpen(id: String): ObjectView {
val request = Rpc.Object.Open.Request(objectId = id)
fun objectOpen(id: String, space: SpaceId): ObjectView {
val request = Rpc.Object.Open.Request(objectId = id, spaceId = space.id)
logRequestIfDebug(request)
val (response, time) = measureTimedValue { service.objectOpen(request) }
logResponseIfDebug(response, time)
@ -1531,8 +1532,8 @@ class Middleware @Inject constructor(
}
@Throws(Exception::class)
fun objectShowOld(id: String): Payload {
val request = Rpc.Object.Show.Request(objectId = id)
fun objectShowOld(id: String, space: SpaceId): Payload {
val request = Rpc.Object.Show.Request(objectId = id, spaceId = space.id)
logRequestIfDebug(request)
val (response, time) = measureTimedValue { service.objectShow(request) }
logResponseIfDebug(response, time)
@ -1541,8 +1542,8 @@ class Middleware @Inject constructor(
}
@Throws(Exception::class)
fun objectShow(id: String): ObjectView {
val request = Rpc.Object.Show.Request(objectId = id)
fun objectShow(id: String, space: SpaceId): ObjectView {
val request = Rpc.Object.Show.Request(objectId = id, spaceId = space.id)
logRequestIfDebug(request)
val (response, time) = measureTimedValue { service.objectShow(request) }
logResponseIfDebug(response, time)