From 0bcd3636770386e8ffc290fb4bc432945d44c3ce Mon Sep 17 00:00:00 2001 From: Valere Date: Tue, 31 Aug 2021 15:49:28 +0200 Subject: [PATCH] Cleaning --- .../session/space/SpaceHierarchySummary.kt | 4 ++-- .../session/space/SpaceChildSummaryResponse.kt | 12 ++++-------- 2 files changed, 6 insertions(+), 10 deletions(-) rename matrix-sdk-android/src/main/java/org/matrix/android/sdk/{internal => api}/session/space/SpaceHierarchySummary.kt (90%) diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceHierarchySummary.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/SpaceHierarchySummary.kt similarity index 90% rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceHierarchySummary.kt rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/SpaceHierarchySummary.kt index bb362b416b..481d6867ca 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceHierarchySummary.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/SpaceHierarchySummary.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 New Vector Ltd + * Copyright 2021 The Matrix.org Foundation C.I.C. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.matrix.android.sdk.internal.session.space +package org.matrix.android.sdk.api.session.space import org.matrix.android.sdk.api.session.events.model.Event import org.matrix.android.sdk.api.session.room.model.RoomSummary diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceChildSummaryResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceChildSummaryResponse.kt index 74faa2653a..7188e77c4f 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceChildSummaryResponse.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceChildSummaryResponse.kt @@ -23,16 +23,12 @@ import org.matrix.android.sdk.api.session.events.model.Event /** * The fields are the same as those returned by /publicRooms (see spec), with the addition of: * room_type: the value of the m.type field from the room's m.room.create event, if any. - * children_state: The m.space.child events of the room. For each event, only the following fields are included1: type, state_key, content, room_id, sender, with the addition of: - * origin_server_ts: This is required for sorting of rooms as specified below. + * children_state: The m.space.child events of the room. + * For each event, only the following fields are included1: type, state_key, content, room_id, sender, + * with the addition of: origin_server_ts: This is required for sorting of rooms as specified below. */ @JsonClass(generateAdapter = true) internal data class SpaceChildSummaryResponse( -// /** -// * The total number of state events which point to or from this room (inbound/outbound edges). -// * This includes all m.space.child events in the room, in addition to m.room.parent events which point to this room as a parent. -// */ -// @Json(name = "num_refs") val numRefs: Int? = null, /** * The room type, which is m.space for subspaces. @@ -41,7 +37,7 @@ internal data class SpaceChildSummaryResponse( @Json(name = "room_type") val roomType: String? = null, /** The m.space.child events of the room. For each event, only the following fields are included: - * type, state_key, content, room_id, sender, with the addition of origin_server_ts: This is required for sorting of rooms as specified below. + * type, state_key, content, room_id, sender, with the addition of origin_server_ts. */ @Json(name = "children_state") val childrenState: List? = null,