Skip to content

Commit c7b54b8

Browse files
authored
legacy groups removal (#6268)
1 parent 92801f6 commit c7b54b8

File tree

90 files changed

+749
-3037
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+749
-3037
lines changed

changelog.d/5733.misc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Communities/Groups are removed completely

changelog.d/5733.sdk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Communities/Groups are removed completely

matrix-sdk-android-flow/src/main/java/org/matrix/android/sdk/flow/FlowSession.kt

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ import org.matrix.android.sdk.api.session.crypto.crosssigning.MXCrossSigningInfo
2626
import org.matrix.android.sdk.api.session.crypto.crosssigning.PrivateKeysInfo
2727
import org.matrix.android.sdk.api.session.crypto.model.CryptoDeviceInfo
2828
import org.matrix.android.sdk.api.session.crypto.model.DeviceInfo
29-
import org.matrix.android.sdk.api.session.group.GroupSummaryQueryParams
30-
import org.matrix.android.sdk.api.session.group.model.GroupSummary
3129
import org.matrix.android.sdk.api.session.identity.ThreePid
3230
import org.matrix.android.sdk.api.session.pushers.Pusher
3331
import org.matrix.android.sdk.api.session.room.RoomSortOrder
@@ -59,13 +57,6 @@ class FlowSession(private val session: Session) {
5957
}
6058
}
6159

62-
fun liveGroupSummaries(queryParams: GroupSummaryQueryParams): Flow<List<GroupSummary>> {
63-
return session.groupService().getGroupSummariesLive(queryParams).asFlow()
64-
.startWith(session.coroutineDispatchers.io) {
65-
session.groupService().getGroupSummaries(queryParams)
66-
}
67-
}
68-
6960
fun liveSpaceSummaries(queryParams: SpaceSummaryQueryParams): Flow<List<RoomSummary>> {
7061
return session.spaceService().getSpaceSummariesLive(queryParams).asFlow()
7162
.startWith(session.coroutineDispatchers.io) {

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/Session.kt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ import org.matrix.android.sdk.api.session.crypto.CryptoService
3333
import org.matrix.android.sdk.api.session.events.EventService
3434
import org.matrix.android.sdk.api.session.file.ContentDownloadStateTracker
3535
import org.matrix.android.sdk.api.session.file.FileService
36-
import org.matrix.android.sdk.api.session.group.GroupService
3736
import org.matrix.android.sdk.api.session.homeserver.HomeServerCapabilitiesService
3837
import org.matrix.android.sdk.api.session.identity.IdentityService
3938
import org.matrix.android.sdk.api.session.integrationmanager.IntegrationManagerService
@@ -154,11 +153,6 @@ interface Session {
154153
*/
155154
fun roomDirectoryService(): RoomDirectoryService
156155

157-
/**
158-
* Returns the GroupService associated with the session.
159-
*/
160-
fun groupService(): GroupService
161-
162156
/**
163157
* Returns the UserService associated with the session.
164158
*/

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/group/Group.kt

Lines changed: 0 additions & 31 deletions
This file was deleted.

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/group/GroupService.kt

Lines changed: 0 additions & 51 deletions
This file was deleted.

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/group/GroupSummaryQueryParams.kt

Lines changed: 0 additions & 44 deletions
This file was deleted.

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/group/model/GroupSummary.kt

Lines changed: 0 additions & 33 deletions
This file was deleted.

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/PermalinkData.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,5 @@ sealed class PermalinkData {
5454

5555
data class UserLink(val userId: String) : PermalinkData()
5656

57-
data class GroupLink(val groupId: String) : PermalinkData()
58-
59-
data class FallbackLink(val uri: Uri) : PermalinkData()
57+
data class FallbackLink(val uri: Uri, val isLegacyGroupLink: Boolean = false) : PermalinkData()
6058
}

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/PermalinkParser.kt

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -61,27 +61,29 @@ object PermalinkParser {
6161
val params = safeFragment
6262
.split(MatrixPatterns.SEP_REGEX)
6363
.filter { it.isNotEmpty() }
64-
.map { URLDecoder.decode(it, "UTF-8") }
6564
.take(2)
6665

66+
val decodedParams = params
67+
.map { URLDecoder.decode(it, "UTF-8") }
68+
6769
val identifier = params.getOrNull(0)
68-
val extraParameter = params.getOrNull(1)
70+
val decodedIdentifier = decodedParams.getOrNull(0)
71+
val extraParameter = decodedParams.getOrNull(1)
6972
return when {
70-
identifier.isNullOrEmpty() -> PermalinkData.FallbackLink(uri)
71-
MatrixPatterns.isUserId(identifier) -> PermalinkData.UserLink(userId = identifier)
72-
MatrixPatterns.isGroupId(identifier) -> PermalinkData.GroupLink(groupId = identifier)
73-
MatrixPatterns.isRoomId(identifier) -> {
74-
handleRoomIdCase(fragment, identifier, matrixToUri, extraParameter, viaQueryParameters)
73+
identifier.isNullOrEmpty() || decodedIdentifier.isNullOrEmpty() -> PermalinkData.FallbackLink(uri)
74+
MatrixPatterns.isUserId(decodedIdentifier) -> PermalinkData.UserLink(userId = decodedIdentifier)
75+
MatrixPatterns.isRoomId(decodedIdentifier) -> {
76+
handleRoomIdCase(fragment, decodedIdentifier, matrixToUri, extraParameter, viaQueryParameters)
7577
}
76-
MatrixPatterns.isRoomAlias(identifier) -> {
78+
MatrixPatterns.isRoomAlias(decodedIdentifier) -> {
7779
PermalinkData.RoomLink(
78-
roomIdOrAlias = identifier,
80+
roomIdOrAlias = decodedIdentifier,
7981
isRoomAlias = true,
8082
eventId = extraParameter.takeIf { !it.isNullOrEmpty() && MatrixPatterns.isEventId(it) },
8183
viaParameters = viaQueryParameters
8284
)
8385
}
84-
else -> PermalinkData.FallbackLink(uri)
86+
else -> PermalinkData.FallbackLink(uri, MatrixPatterns.isGroupId(identifier))
8587
}
8688
}
8789

0 commit comments

Comments
 (0)