Commit graph

6120 commits

Author SHA1 Message Date
Adam Brown
4482cbdaa6 using dedicated pusher removal methods for the different types of pushers
- also adds a separate removePusher which supports removing any type of pusher
2021-09-24 17:00:48 +01:00
Adam Brown
7fd794bd7a reusing existing setTextOrHide by adding an additional parameter to hide other views 2021-09-24 15:44:10 +01:00
Adam Brown
3a1cb1c07a monitoring the ThreePids so that the notifications screen updates when returning from adding an email
- makes use of both sync and async fetching so that the page can avoid jumping around on the initial load
2021-09-23 14:46:07 +01:00
Adam Brown
0302d19f47 formatting 2021-09-23 13:20:01 +01:00
Adam Brown
43eff8b85b reusing existing remove string 2021-09-23 13:05:18 +01:00
Adam Brown
1d4c909b50 adding translator note about the enable email placeholder 2021-09-23 13:02:36 +01:00
Adam Brown
1865e3c450 hiding the notification url/format UI fields when they're null (which is the case for email pushers) 2021-09-23 12:54:52 +01:00
Adam Brown
d31ad7e187 extracting constants for the pusher kinds and email appId 2021-09-23 12:33:48 +01:00
Adam Brown
4c4f2fce74 catching remove pusher errors in the notification targets screen
- displays a dialog with a human readable version of the error
2021-09-23 12:27:56 +01:00
Adam Brown
efec63e979 documenting the getEmails function and lifting it out of the class as it's not directly tied to the class 2021-09-23 12:02:46 +01:00
Adam Brown
8316728e53 removing this. usages where there's no clashes 2021-09-23 11:45:09 +01:00
Adam Brown
0617179c20 removing trailing comma for lint 2021-09-21 15:59:29 +01:00
Adam Brown
03eb36636d capturing the original switch state at the point of clicking the switch rather than when the listener is initially set 2021-09-21 15:26:51 +01:00
Adam Brown
710f2f92cb cleaning up the notification email group xml definition to include a self closing tag
- the category is dynamically populated so we shouldn't be adding anything static here anyways!
2021-09-21 13:46:23 +01:00
Adam Brown
2c25efc36a making the removePusher more generic as it can handle email and http pushers
- Updates the doc to reflect that to remove emails an appId of m.email is required
2021-09-21 13:46:18 +01:00
Adam Brown
78d70eab12 enforcing emails pushes to always be appended
- always appending allows the same email to be used for other accounts see https://github.com/matrix-org/matrix-react-sdk/pull/2727 https://github.com/matrix-org/matrix-react-sdk/pull/2727/files#diff-ec232520bf51337e5e6939b885d21f428ad6da3306c8e17a3ff660b2b341179dR165
2021-09-21 11:32:33 +01:00
Adam Brown
516bb6ed95 lifting the email branding to its own parameter so clients of the sdk can configure it 2021-09-21 11:26:11 +01:00
Adam Brown
0b293d08cc handling errors when enabling/disabling email notifications
- Extracts out a transactional switch helper to handle reverting the switch back to its original state if an error occurs
- Reuses existing toast message for unknown error
- Does not include the isAdded to the async callback as the couroutine is tied to the fragment lifecycle scope
2021-09-21 11:16:09 +01:00
Adam Brown
410cf5c062 adding UI toggle for email notifications in /settings/notifications
- will display a _no emails_ when the matrix account has no emails set and tapping will navigate to the emails and phone numbers screen where the user can add an email
- toggling the email notification with register and unregister push notification for the given email address
2021-09-21 10:47:03 +01:00
Adam Brown
1591375aa2 adding ability to remove push targets from the notification target screen 2021-09-20 16:35:53 +01:00
Benoit Marty
f418683da5
Merge pull request #4014 from vector-im/feature/fga/hide_jitsi_event
Jitsi: introduces ConferenceEvent
2021-09-17 18:07:33 +02:00
Benoit Marty
b5f7351564
Merge pull request #4008 from vector-im/feature/fga/small_timeline_optimisation
Feature/fga/small timeline optimisation
2021-09-17 18:06:58 +02:00
Valere
33273955cb Fix unused var 2021-09-17 14:54:05 +02:00
Valere
d2af7e3f91 Code review 2021-09-17 14:26:25 +02:00
Valere
6d023188da code review 2021-09-17 10:26:32 +02:00
Valere
f79681b343 Clean unneeded beta pills 2021-09-17 09:22:10 +02:00
Valere
932a43ef58 Add subspace action 2021-09-17 09:22:10 +02:00
Valere
100ac49cac
Merge pull request #4000 from vector-im/feature/bca/fix_space_parent
Fix parent relation handling
2021-09-16 11:45:29 +02:00
Valere
421c2ae0ba Fix missing string resource 2021-09-16 10:30:43 +02:00
Valere
94f88c80fc Fix parent relation handling 2021-09-16 09:33:06 +02:00
Valere
cfed0f839b Code review 2021-09-16 09:20:25 +02:00
Valere
9a9a3d8cc6 Cherry pick room on leave space 2021-09-16 09:20:25 +02:00
Valere
8fd784e275 Improve leave space (all + none) 2021-09-16 09:20:25 +02:00
Valere
70ebb3a3f2 Code review 2021-09-15 18:48:40 +02:00
Valere
2c1435f08c Change default power to invite in private space + setting 2021-09-15 18:47:38 +02:00
ganfra
0460a48c0c Fix DTMF not working #4015 2021-09-15 11:25:08 +02:00
Benoit Marty
1b59c7b451
Merge pull request #3989 from vector-im/feature/bca/space_fix_3956
Fix /  Kick user dialog for spaces talks about rooms
2021-09-14 20:35:40 +02:00
Benoit Marty
3575157f1c
Merge pull request #3976 from vector-im/feature/bca/space_team_invite_mail
Add invite by email screen in create space flow
2021-09-14 20:18:35 +02:00
ganfra
27d4f60578 Jitsi: introduces ConferenceEvent to avoid using directly Jitsi sdk from fragments/activities 2021-09-14 18:50:51 +02:00
Valere
c0b01dff70 code review 2021-09-14 15:25:40 +02:00
Benoit Marty
449eac0d99 Fix annoying issue detected by lint (CheckResult) and consider that's errors from now 2021-09-10 18:14:39 +02:00
ganfra
2144bb9d49 Timeline: remove reaction animation views for now 2021-09-09 18:30:45 +02:00
Valere
d758d5c270 Fix / Kick user dialog for spaces talks about rooms 2021-09-09 14:20:38 +02:00
Benoit Marty
34edc79450 Fix warning "Opt-in requirement marker annotation on override requires the same marker on base declaration (will be an error in 1.6)" 2021-09-08 22:39:37 +02:00
Benoit Marty
fcd72fd9e3
Merge pull request #3991 from vector-im/feature/fga/fix_memory_leak_room_detail
Fix memory leak on RoomDetailFragment
2021-09-08 17:28:26 +02:00
ganfra
3119de42fb Fix memory leak on RoomDetailFragment 2021-09-08 16:47:53 +02:00
Weblate
5e9be4860d Merge branch 'origin/develop' into Weblate. 2021-09-08 13:44:59 +00:00
Le Dang Trung
f1fe9d83fe Translated using Weblate (Vietnamese)
Currently translated at 34.9% (914 of 2615 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/vi/
2021-09-08 13:44:35 +00:00
Ihor Hordiichuk
081206db1c Translated using Weblate (Ukrainian)
Currently translated at 81.3% (2126 of 2615 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
2021-09-08 13:44:18 +00:00
Niels Bouma
efe03ec681 Translated using Weblate (Dutch)
Currently translated at 51.4% (1345 of 2615 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/nl/
2021-09-08 13:44:12 +00:00