Feature/bca/room caps restricted by BillCarsonFr · Pull Request #3663 · element-hq/element-android

BillCarsonFr · 2021-07-12T10:15:53Z

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

bmarty

Nice work.

I cannot test on matrix.org yet AFAIU.

Some remark in the mean time.

bmarty · 2021-07-20T10:33:50Z

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

        val status: RoomVersionStatus
 )

+@JsonClass(generateAdapter = true)


This is not a Json class?

bmarty · 2021-07-20T10:34:27Z

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

        val defaultRoomVersion: String,
-        val supportedVersion: List<RoomVersionInfo>
+        val supportedVersion: List<RoomVersionInfo>,
+        val capabilities: Map<String, RoomCapabilitySupport>?


What are the keys?

added a comment

bmarty · 2021-07-20T10:36:58Z

...ndroid/src/main/java/org/matrix/android/sdk/api/session/homeserver/HomeServerCapabilities.kt

+        return info.preferred == byRoomVersion || info.support.contains(byRoomVersion)
+    }
+
+    fun versionOverrideForFeature(feature: String) : String? {


Can you add some doc for this public APIs?

bmarty · 2021-07-20T10:38:16Z

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

+
+    suspend fun setJoinRulePublic()
+    suspend fun setJoinRuleInviteOnly()
+    suspend fun setJoinRuleRestricted(allowList: List<String>)


These 3 fun should be moved to StateService and documented please.

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

bmarty · 2021-07-20T10:40:45Z

...roid/src/main/java/org/matrix/android/sdk/api/session/room/model/create/RoomFeaturePreset.kt

+import org.matrix.android.sdk.api.session.room.model.RoomJoinRulesAllowEntry
+import org.matrix.android.sdk.api.session.room.model.RoomJoinRulesContent
+
+interface RoomFeaturePreset {


Interface and class must be moved to internal package and declared internal.

It's public, used in CreateSpaceViewModelTask for example

bmarty · 2021-07-20T12:19:49Z

vector/src/main/res/layout/fragment_space_restricted_select.xml

+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <com.google.android.material.appbar.CollapsingToolbarLayout


Is this used?

yes it's snapping but no animation

bmarty · 2021-07-20T12:21:44Z

vector/src/main/res/values/strings.xml

+    <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>


Too many spaces in room. If and find and

bmarty · 2021-07-20T12:22:34Z

vector/src/main/res/values/strings.xml


    <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>


dup spaces everyone. You’ll

bmarty · 2021-07-20T12:22:47Z

vector/src/main/res/values/strings.xml

    <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>


Dup everyone. You

bmarty · 2021-07-20T12:22:56Z

vector/src/main/res/values/strings.xml

+    <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>


room. All

bmarty · 2021-07-20T12:27:42Z

vector/src/main/res/layout/fragment_join_rules_recycler.xml

+
+        <Button
+            android:id="@+id/cancelButton"
+            style="@style/Widget.Vector.Button.Outlined"


Style "Widget.Vector.Button.Text"

https://www.figma.com/file/HOGxCoUWoedha639SjD90n/%5BBeta%5D-Restricted-room-access?node-id=112%3A63139

bmarty · 2021-07-20T12:29:32Z

On the Room access setting screen, we do not have the classical room setting header (see Figma)

Expected:

Actual:

bmarty changed the title ~~Feature/bca/room caps restriced~~ Feature/bca/room caps restricted Jul 12, 2021

BillCarsonFr marked this pull request as ready for review July 16, 2021 09:46

BillCarsonFr requested a review from bmarty July 20, 2021 07:23

bmarty requested changes Jul 20, 2021

View reviewed changes

bmarty reviewed Jul 20, 2021

View reviewed changes

BillCarsonFr force-pushed the feature/bca/room_caps_restriced branch from eae2f73 to 85d3941 Compare July 27, 2021 12:58

BillCarsonFr added the A-Spaces Spaces, groups, communities label Jul 30, 2021

BillCarsonFr added 10 commits July 30, 2021 18:43

WIP

6c2a917

Cleaning

3da20ae

Restricted room mgmt when supported

2f16a7f

handle migration before setting restricted

c9ef08d

cleaning

30c299e

Add change log

a626f42

Code quality

5adceac

Cleaning

88fec37

klint

a7dc7e8

Code review

efdaa49

BillCarsonFr force-pushed the feature/bca/room_caps_restriced branch from 85d3941 to c475418 Compare July 30, 2021 16:48

fix rebase

aaa9c7e

BillCarsonFr force-pushed the feature/bca/room_caps_restriced branch from c475418 to aaa9c7e Compare July 30, 2021 17:05

BillCarsonFr merged commit 60caac4 into develop Jul 30, 2021

BillCarsonFr deleted the feature/bca/room_caps_restriced branch July 30, 2021 17:41


		<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>

Conversation

BillCarsonFr commented Jul 12, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

bmarty left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

bmarty commented Jul 20, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

BillCarsonFr commented Jul 12, 2021 •

edited

Loading