Feature/bca/room caps restricted #3663
Merged
Conversation
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
bmarty
changed the title
bmarty
requested changes
Jul 20, 2021
| ) | ||
|
|
||
| data class RoomVersionInfo( | ||
| val version: String, | ||
| val status: RoomVersionStatus | ||
| ) | ||
|
|
||
| @JsonClass(generateAdapter = true) |
| data class RoomVersionCapabilities( | ||
| val defaultRoomVersion: String, | ||
| val supportedVersion: List<RoomVersionInfo> | ||
| val supportedVersion: List<RoomVersionInfo>, | ||
| val capabilities: Map<String, RoomCapabilitySupport>? |
| return info.preferred == byRoomVersion || info.support.contains(byRoomVersion) | ||
| } | ||
|
|
||
| fun versionOverrideForFeature(feature: String) : String? { |
There was a problem hiding this comment.
Can you add some doc for this public APIs?
|
|
||
| suspend fun setJoinRulePublic() | ||
| suspend fun setJoinRuleInviteOnly() | ||
| suspend fun setJoinRuleRestricted(allowList: List<String>) |
There was a problem hiding this comment.
These 3 fun should be moved to StateService and documented please.
There was a problem hiding this comment.
Initially it was in state service, but the join restricted is doing more than just state, it is also computing the via parameters. It feels strange to inject he viaParameterFinder in state event as it requires roomGetter.
I have put it back in StateService
| import org.matrix.android.sdk.api.session.room.model.RoomJoinRulesAllowEntry | ||
| import org.matrix.android.sdk.api.session.room.model.RoomJoinRulesContent | ||
|
|
||
| interface RoomFeaturePreset { |
There was a problem hiding this comment.
Interface and class must be moved to internal package and declared internal.
There was a problem hiding this comment.
It's public, used in CreateSpaceViewModelTask for example
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content"> | ||
|
|
||
| <com.google.android.material.appbar.CollapsingToolbarLayout |
There was a problem hiding this comment.
yes it's snapping but no animation
| <string name="room_create_member_of_space_name_can_join">Members of Space %s can find, preview and join.</string> | ||
| <string name="allow_space_member_to_find_and_access">Allow space members to find and access.</string> | ||
| <string name="spaces_which_can_access">Spaces which can access</string> | ||
| <string name="decide_which_spaces_can_access">Decide which spaces can access this room. If a space is selected its members will be able to find and join Room name.</string> |
There was a problem hiding this comment.
Too many spaces in room. If and find and
|
|
||
| <string name="room_using_unstable_room_version">This room is running room version %s, which this homeserver has marked as unstable.</string> | ||
| <string name="room_upgrade_to_recommended_version">Upgrade to the recommended room version</string> | ||
|
|
||
| <string name="error_failed_to_join_room">Sorry, an error occurred while trying to join: %s</string> | ||
|
|
||
| <string name="upgrade_room_for_restricted">Anyone in %s will be able to find and join this room - no need to manually invite everyone. You’ll be able to change this in room settings anytime.</string> |
|
|
||
| <string name="room_using_unstable_room_version">This room is running room version %s, which this homeserver has marked as unstable.</string> | ||
| <string name="room_upgrade_to_recommended_version">Upgrade to the recommended room version</string> | ||
|
|
||
| <string name="error_failed_to_join_room">Sorry, an error occurred while trying to join: %s</string> | ||
|
|
||
| <string name="upgrade_room_for_restricted">Anyone in %s will be able to find and join this room - no need to manually invite everyone. You’ll be able to change this in room settings anytime.</string> | ||
| <string name="upgrade_room_for_restricted_no_param">Anyone in a parent space will be able to find and join this room - no need to manually invite everyone. You’ll be able to change this in room settings anytime.</string> |
| <string name="upgrade_room_for_restricted">Anyone in %s will be able to find and join this room - no need to manually invite everyone. You’ll be able to change this in room settings anytime.</string> | ||
| <string name="upgrade_room_for_restricted_no_param">Anyone in a parent space will be able to find and join this room - no need to manually invite everyone. You’ll be able to change this in room settings anytime.</string> | ||
|
|
||
| <string name="upgrade_room_for_restricted_note">Please note upgrading will make a new version of the room. All current messages will stay in this archived room.</string> |
bmarty
reviewed
Jul 20, 2021
|
|
||
| <Button | ||
| android:id="@+id/cancelButton" | ||
| style="@style/Widget.Vector.Button.Outlined" |
There was a problem hiding this comment.
Style "Widget.Vector.Button.Text"
Expected:
Actual:
|
BillCarsonFr
force-pushed
the
feature/bca/room_caps_restriced
branch
from
eae2f73 to
85d3941
Compare
BillCarsonFr
force-pushed
the
feature/bca/room_caps_restriced
branch
from
85d3941 to
c475418
Compare
BillCarsonFr
force-pushed
the
feature/bca/room_caps_restriced
branch
from
c475418 to
aaa9c7e
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #3509
Fixes #3665
Fixes #3508
New setting screen that allow to use the new restricted access rule
If the selected room is using a version that do not support restricted, a button will be displayed to migrate the room first (shown only if the server supports the restricted join rule as per Room caps MSC