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

Fixes #241 #259

Open
wants to merge 27 commits into
base: sc
Choose a base branch
from
Open

Fixes #241 #259

wants to merge 27 commits into from

Conversation

GlebMikhailov
Copy link

This MR fixes issues found in closed MR #241. In particular, the NotificationUtils class has been split, the function has been renamed from jitsiCallIntent to getCallIntent, and a new method for removing notifications from the user side - rejectNotification - has been added.

@SpiritCroc
Copy link
Member

Note of advice, if you want to have any chance that I review this PR to maybe get it merged at some point, changes should be minimal to achieve the goal, while being as upstream-merge-friendly as possible. Currently the diff is way too huge and touches lots of upstream files. You may want to read up on #250 as well for some hints.

@GlebMikhailov
Copy link
Author

This MR incorporates all the logic that appeared in MR #241 and includes fixes for all comments. In order to improve maintainability and readability, the NotificationsUtils class was refactored. As a result, three new classes were created: NotificationBuilderUtils, NotificationCommonUtils, and NotificationUtils. This entailed changes to a number of files related to method porting.

@GlebMikhailov GlebMikhailov marked this pull request as ready for review December 22, 2024 02:07
@GlebMikhailov GlebMikhailov marked this pull request as draft December 23, 2024 21:20
@GlebMikhailov GlebMikhailov marked this pull request as ready for review December 24, 2024 00:28
@GlebMikhailov
Copy link
Author

Made changes: put all utils for jitsi into a separate class - JitsiNotificationsUtils. Went through the whole code - significantly reduced upstream issues.

Could you please take a look at this MP?

@alexander-potemkin
Copy link

Note of advice, if you want to have any chance that I review this PR to maybe get it merged at some point, changes should be minimal to achieve the goal, while being as upstream-merge-friendly as possible. Currently the diff is way too huge and touches lots of upstream files. You may want to read up on #250 as well for some hints.

Hey @SpiritCroc , Merry Christmas! :)

And thank you for checking that PR - it was me, who asked @GlebMikhailov to take over where it was left earlier, with the respect to all the comments you made earlier, to make sure the PR will be easy to accept and maintain.

I remember you do it in your free time and I understand if you will refuse it, I hope however, that there will be a way to make it all right and comfortable for you to accept - please, don't hesitate to let us know on anything that shall be adjusted 🙏🏻

@SpiritCroc
Copy link
Member

Thanks. On first glance I thinks it looks better than the old PR. Like usual, I don't know when/if I'll have time to properly review this though.

One remark from my first look, does anybody actually need settings_labs_enable_jitsi_call_notifications_default? I think I removed it in my clean up of the old PR before but it's again here in this one. For me looks just like a useless source of merge conflicts, since we don't have the use-case that upstream has for such config resources. If it's needed for anything, should be moved into something like config-settings_sc.xml but probably best to just drop it

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants