-
Notifications
You must be signed in to change notification settings - Fork 739
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2439 from vector-im/feature/bma/alias
Add room alias management
- Loading branch information
Showing
75 changed files
with
2,243 additions
and
219 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
32 changes: 32 additions & 0 deletions
32
...x-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/alias/AliasService.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| /* | ||
| * Copyright 2020 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. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.matrix.android.sdk.api.session.room.alias | ||
|
|
||
| interface AliasService { | ||
| /** | ||
| * Get list of local alias of the room | ||
| * @return the list of the aliases (full aliases, not only the local part) | ||
| */ | ||
| suspend fun getRoomAliases(): List<String> | ||
|
|
||
| /** | ||
| * Add local alias to the room | ||
| * @param aliasLocalPart the local part of the alias. | ||
| * Ex: for the alias "#my_alias:example.org", the local part is "my_alias" | ||
| */ | ||
| suspend fun addAlias(aliasLocalPart: String) | ||
| } |
23 changes: 23 additions & 0 deletions
23
...sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/alias/RoomAliasError.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| /* | ||
| * Copyright 2020 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. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.matrix.android.sdk.api.session.room.alias | ||
|
|
||
| sealed class RoomAliasError : Throwable() { | ||
| object AliasEmpty : RoomAliasError() | ||
| object AliasNotAvailable : RoomAliasError() | ||
| object AliasInvalid : RoomAliasError() | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
70 changes: 70 additions & 0 deletions
70
...k-android/src/main/java/org/matrix/android/sdk/internal/session/directory/DirectoryAPI.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| /* | ||
| * Copyright 2020 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. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.matrix.android.sdk.internal.session.directory | ||
|
|
||
| import org.matrix.android.sdk.internal.network.NetworkConstants | ||
| import org.matrix.android.sdk.internal.session.room.alias.AddRoomAliasBody | ||
| import org.matrix.android.sdk.internal.session.room.alias.RoomAliasDescription | ||
| import retrofit2.Call | ||
| import retrofit2.http.Body | ||
| import retrofit2.http.DELETE | ||
| import retrofit2.http.GET | ||
| import retrofit2.http.PUT | ||
| import retrofit2.http.Path | ||
|
|
||
| internal interface DirectoryAPI { | ||
| /** | ||
| * Get the room ID associated to the room alias. | ||
| * | ||
| * @param roomAlias the room alias. | ||
| */ | ||
| @GET(NetworkConstants.URI_API_PREFIX_PATH_R0 + "directory/room/{roomAlias}") | ||
| fun getRoomIdByAlias(@Path("roomAlias") roomAlias: String): Call<RoomAliasDescription> | ||
|
|
||
| /** | ||
| * Get the room directory visibility. | ||
| * | ||
| * @param roomId the room id. | ||
| */ | ||
| @GET(NetworkConstants.URI_API_PREFIX_PATH_R0 + "directory/list/room/{roomId}") | ||
| fun getRoomDirectoryVisibility(@Path("roomId") roomId: String): Call<RoomDirectoryVisibilityJson> | ||
|
|
||
| /** | ||
| * Set the room directory visibility. | ||
| * | ||
| * @param roomId the room id. | ||
| * @param body the body containing the new directory visibility | ||
| */ | ||
| @PUT(NetworkConstants.URI_API_PREFIX_PATH_R0 + "directory/list/room/{roomId}") | ||
| fun setRoomDirectoryVisibility(@Path("roomId") roomId: String, | ||
| @Body body: RoomDirectoryVisibilityJson): Call<Unit> | ||
|
|
||
| /** | ||
| * Add alias to the room. | ||
| * @param roomAlias the room alias. | ||
| */ | ||
| @PUT(NetworkConstants.URI_API_PREFIX_PATH_R0 + "directory/room/{roomAlias}") | ||
| fun addRoomAlias(@Path("roomAlias") roomAlias: String, | ||
| @Body body: AddRoomAliasBody): Call<Unit> | ||
|
|
||
| /** | ||
| * Delete a room alias | ||
| * @param roomAlias the room alias. | ||
| */ | ||
| @DELETE(NetworkConstants.URI_API_PREFIX_PATH_R0 + "directory/room/{roomAlias}") | ||
| fun deleteRoomAlias(@Path("roomAlias") roomAlias: String): Call<Unit> | ||
| } |
29 changes: 29 additions & 0 deletions
29
...ain/java/org/matrix/android/sdk/internal/session/directory/RoomDirectoryVisibilityJson.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| /* | ||
| * Copyright 2020 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. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.matrix.android.sdk.internal.session.directory | ||
|
|
||
| import com.squareup.moshi.Json | ||
| import com.squareup.moshi.JsonClass | ||
| import org.matrix.android.sdk.api.session.room.model.RoomDirectoryVisibility | ||
|
|
||
| @JsonClass(generateAdapter = true) | ||
| internal data class RoomDirectoryVisibilityJson( | ||
| /** | ||
| * The visibility of the room in the directory. One of: ["private", "public"] | ||
| */ | ||
| @Json(name = "visibility") val visibility: RoomDirectoryVisibility | ||
| ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.