Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#2782: Collapse server ACLs update events #5249

Merged
merged 5 commits into from
Feb 18, 2022

Conversation

mnaturel
Copy link
Contributor

@mnaturel mnaturel commented Feb 16, 2022

Type of change

  • Feature
  • Bugfix
  • Technical
  • Other : Enhancement

Content

Merge of multiple successive received server ACLs updates in a room into a single collapsable/expandable item.

Motivation and context

See #2782

Screenshots / GIFs

Tests

  • Go to a room where there are many successive ACLs events
  • Check the events are merged together
  • Click on "expand" button
  • Check all corresponding events are listed
  • Click on "collapse" button
  • Check all events are merged together

Tested devices

  • Physical
  • Emulator
  • OS version(s): Android 11

Checklist

@mnaturel mnaturel added the Z-WTF WTF moment: High Impact, Low Effort label Feb 16, 2022
@github-actions
Copy link

github-actions bot commented Feb 16, 2022

Unit Test Results

  84 files  +  8    84 suites  +8   54s ⏱️ -4s
157 tests +13  157 ✔️ +13  0 💤 ±0  0 ±0 
504 runs  +52  504 ✔️ +52  0 💤 ±0  0 ±0 

Results for commit bdfe563. ± Comparison against base commit 343b8bf.

♻️ This comment has been updated with latest results.

@github-actions
Copy link

github-actions bot commented Feb 16, 2022

Matrix SDK

Integration Tests Results:

  • [org.matrix.android.sdk.session]
    passed=
  • [org.matrix.android.sdk.account]
    passed=
  • [org.matrix.android.sdk.internal]
    passed=
  • [org.matrix.android.sdk.ordering]
    passed=
  • [org.matrix.android.sdk.PermalinkParserTest]
    passed=

Copy link
Member

@bmarty bmarty left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, this PR will be really appreciated once in production.
Just a remark about a class name, else LGTM!

@@ -82,7 +83,7 @@ class MergedHeaderItemFactory @Inject constructor(private val activeSessionHolde
event: TimelineEvent,
eventIdToHighlight: String?,
requestModelBuild: () -> Unit,
callback: TimelineEventController.Callback?): MergedMembershipEventsItem_? {
callback: TimelineEventController.Callback?): DefaultMergedEventsItem_? {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK for the renaming, but maybe something like SimilarEventsMergedItem would be more appropriate. Default prefix is reserved for default implementation of interfaces.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay, I renamed the class to MergedSimilarEventsItem to be consistent with existing MergedRoomCreationItem. Is that okay?

Copy link
Member

@bmarty bmarty left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the update!

@bmarty bmarty marked this pull request as ready for review February 18, 2022 09:54
@bmarty bmarty merged commit 3b0856b into develop Feb 18, 2022
@bmarty bmarty deleted the feature/mna/2782-collapse-acl-events branch February 18, 2022 09:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Z-WTF WTF moment: High Impact, Low Effort
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants