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.

Sign up for GitHub

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

Jump to bottom

Feature/noid/handle federation room capabilities #3663

Merged
merged 1 commit into from
Mar 1, 2024
Merged

Feature/noid/handle federation room capabilities #3663

merged 1 commit into from
Mar 1, 2024

Conversation

mahibi
Copy link
Collaborator

@mahibi mahibi commented Feb 26, 2024 •
edited
Loading

resolve #3526

To test,

  • please just try out all kind of actions in the affected Activities, esp. Chat Activity.
  • enter normal rooms and federated rooms(on sermo)

🏁 Checklist

  • ⛑️ Tests (unit and/or integration) are included or not needed
  • 🔖 Capability is checked or not needed
  • 🔙 Backport requests are created or not needed: /backport to stable-xx.x
  • 📅 Milestone is set
  • 🌸 PR title is meaningful (if it should be in the changelog: is it meaningful to users?)

@mahibi mahibi force-pushed the feature/noid/handleFederationRoomCapabilities branch 4 times, most recently from 2d1109d to a2f13e2 Compare February 28, 2024 17:57
@mahibi mahibi added this to the 19.0.0 milestone Feb 28, 2024
@mahibi mahibi self-assigned this Feb 28, 2024
@mahibi mahibi force-pushed the feature/noid/handleFederationRoomCapabilities branch from a2f13e2 to 44a7409 Compare February 28, 2024 18:02
@mahibi mahibi marked this pull request as ready for review February 28, 2024 18:02
@mahibi mahibi added the 3. to review Waiting for reviews label Feb 28, 2024
AndyScherzinger
AndyScherzinger approved these changes Feb 28, 2024
View reviewed changes
Copy link
Member

@AndyScherzinger AndyScherzinger left a comment

Choose a reason for hiding this comment

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

LGTM

@mahibi mahibi force-pushed the feature/noid/handleFederationRoomCapabilities branch from 44a7409 to 5262401 Compare March 1, 2024 10:00
@mahibi
pass spreedCapabilities instead user to CapabilitiesUtil
754b825 
To support federated rooms, capabilities have to be checked from the room which now also has capabilities.
If room is not federated, capabilities fromuser are still checked.
This is why CapabilitiesUtil had to be refactored to accept SpreedCapabilities which can come from room or user.

Other than that, many other changes were made as a result of this change.

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
@mahibi mahibi force-pushed the feature/noid/handleFederationRoomCapabilities branch from 5262401 to 754b825 Compare March 1, 2024 10:25
@mahibi mahibi disabled auto-merge March 1, 2024 10:27
@mahibi mahibi merged commit f11b426 into master Mar 1, 2024
10 of 16 checks passed
@mahibi mahibi deleted the feature/noid/handleFederationRoomCapabilities branch March 1, 2024 10:28
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Mar 1, 2024

APK file: https://www.kaminsky.me/nc-dev/android-artifacts/3663-talk.apk

qrcode

To test this change/fix you can simply download above APK file and install and test it in parallel to your existing Nextcloud Talk app.

@mahibi mahibi mentioned this pull request Mar 1, 2024
Merged
5 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sowjanyakch sowjanyakch sowjanyakch approved these changes

@AndyScherzinger AndyScherzinger AndyScherzinger approved these changes

@rapterjet2004 rapterjet2004 Awaiting requested review from rapterjet2004

Assignees

@mahibi mahibi

Labels
3. to review Waiting for reviews
Projects
None yet
Milestone
19.0.0
Development

Successfully merging this pull request may close these issues.

🌐 Federated Capabilities 🏗️ - Android
3 participants
@mahibi @AndyScherzinger @sowjanyakch