Commit Graph

11190 Commits

Author SHA1 Message Date
Adam Brown 67211605aa removing unused commented code 2021-10-26 20:03:10 +01:00
Adam Brown 1c0d69674d moving is invitation help to the event file 2021-10-26 20:03:10 +01:00
Adam Brown 37a7d449ae moving invitiation joined event filtering to the existing mapNotNull chain to avoid another list creation 2021-10-26 20:03:10 +01:00
Adam Brown 0c809b5ed1 now that we ignore duplicated invite joined events at the source we can avoid eager notification cancels and rely on the main notification refresh flow 2021-10-26 20:03:10 +01:00
Adam Brown e95d49a3ae avoiding dispatching invitation accepted events
- we only want to notify users when they receive an invititation, not when they've accepted it
2021-10-26 20:03:10 +01:00
Benoit Marty 109a5a6664
Merge pull request #4332 from vector-im/feature/bma/do_not_inject_default
DI: Use interfaces instead of implementation
2021-10-26 20:45:13 +02:00
Benoit Marty a19999a717
Merge pull request #4345 from vector-im/feature/adm/unable-to-join-by-name
Unable to join room by name
2021-10-26 19:35:44 +02:00
Benoit Marty 31abf44d0e
Merge pull request #4346 from vector-im/feature/bma/login_custom
Add API `LoginWizard.loginCustom(data: JsonDict): Session`
2021-10-26 19:28:30 +02:00
Benoit Marty 1d8a4a923a
Merge pull request #4344 from vector-im/feature/bma/device_id_param
Add optional deviceId to the login API
2021-10-26 19:24:09 +02:00
Adam Brown 272baa52ec adding remaining activity missing hilt injection annotations 2021-10-26 17:56:22 +01:00
Benoit Marty e8ccae8cd0 Add API `LoginWizard.loginCustom(data: JsonDict): Session` to be able to login to a homeserver using arbitrary request content 2021-10-26 18:38:15 +02:00
Adam Brown 4361926075 adding changelog entry 2021-10-26 17:22:26 +01:00
Adam Brown 881157a725 applying the room navigation interceptor to only the room activity navigation, not the bottomsheets
- the bottomsheets require the activity to stay around as they host the sheet instance, fixes missing join sheets
2021-10-26 17:15:19 +01:00
Adam Brown 49c969601d adding missing bottomsheet handling for displaying the join room sheet when linking from the public rooms
- the activity is still finished causing the popup to not actually display
2021-10-26 17:14:24 +01:00
Benoit Marty 01a29f67d0 Version++ 2021-10-26 17:33:23 +02:00
Benoit Marty 8ac48b903a Merge branch 'hotfix/1.3.6' into develop 2021-10-26 17:31:10 +02:00
Benoit Marty eb66a51891 Merge branch 'hotfix/1.3.6'
Conflicts:
	vector/src/main/java/im/vector/app/features/login/LoginViewModel.kt
2021-10-26 17:30:39 +02:00
Benoit Marty 6c485d5f6e Merge hotfix 1.3.6 2021-10-26 17:23:33 +02:00
Adam Brown 792444d1ac adding missing hilt annotation for injectable activity 2021-10-26 16:23:32 +01:00
Benoit Marty edd29ec4ef fastlane change 2021-10-26 16:51:59 +02:00
Benoit Marty 093b5c76ab towncrier 2021-10-26 16:51:08 +02:00
Benoit Marty f2330903ae Add named parameter for boolean 2021-10-26 16:49:38 +02:00
Benoit Marty 9f1efab18d Correctly handle url of type https://mobile.element.io/?hs_url=…&is_url=
Skip the choose server screen when such URL are open when Element
2021-10-26 16:49:21 +02:00
Benoit Marty dc5739c11d Format 2021-10-26 16:46:20 +02:00
Benoit Marty 0236396c59 Add optional deviceId to the login API 2021-10-26 15:10:04 +02:00
Benoit Marty d0f226dcd1 Bind identity service 2021-10-25 15:47:17 +02:00
Benoit Marty 363ae79378 DI: Use interfaces instead of implementation 2021-10-25 15:32:27 +02:00
Benoit Marty f2c22c1985
Merge pull request #4192 from vector-im/yostyle/cipher_suites
Limit supported TLS versions and cipher suites
2021-10-25 13:07:21 +02:00
Benoit Marty 3354cd1760
Merge pull request #4312 from vector-im/feature/fga/hilt_app_migration
Migrate App DI framework to Hilt
2021-10-25 12:41:02 +02:00
Benoit Marty 79d56319b7 Version++ 2021-10-25 12:40:24 +02:00
Benoit Marty cabdec166f Merge branch 'release/1.3.5' into main 2021-10-25 12:39:11 +02:00
Benoit Marty 90eee339a3 Merge branch 'release/1.3.5' into develop 2021-10-25 12:39:10 +02:00
Benoit Marty f877965550 Fastlane files 2021-10-25 12:38:53 +02:00
Benoit Marty 201d558925 Update previous Changelog (the file was not in the correct folder) 2021-10-25 12:37:41 +02:00
Benoit Marty b892331e42 Towncrier 2021-10-25 12:35:11 +02:00
Benoit Marty 8b6e0187d6
Merge pull request #4320 from vector-im/feature/adm/malformed-group-link
Fixing grouped notification causing malformed url
2021-10-25 12:20:04 +02:00
Adam Brown 55c00a0975 adding changelog entry 2021-10-25 10:56:15 +01:00
Adam Brown 325e78106e
fixing strange ide extract 2021-10-25 10:51:40 +01:00
Adam Brown 06b3cc3f4b filters the unique notification uris from the link handling
- fixes malformed url errors appearing for uri we only create to force uniqueness in the notifications
2021-10-22 18:29:53 +01:00
ganfra e1f4e4f934 Hilt: fix test 2021-10-22 18:38:48 +02:00
ganfra c87d276f8a Hilt: fix fdroid 2021-10-22 18:09:14 +02:00
Benoit Marty 09fbd5fcf5
Merge pull request #4316 from vector-im/feature/fga/fix_4313
Fix unread marker not showing
2021-10-22 15:42:22 +02:00
ganfra a82a5c9b32 Fix unread marker not showing #4313 2021-10-22 15:19:39 +02:00
ganfra e6e8c7f7d1 Hilt: clean code and add changelog 2021-10-22 12:41:06 +02:00
ganfra e9b58844b3 Merge branch 'develop' into feature/fga/hilt_app_migration 2021-10-22 11:30:49 +02:00
ganfra d89264ff77 Hilt: add small migration guide 2021-10-22 11:30:21 +02:00
ganfra b6501ce7b2 Hilt: continue cleaning up 2021-10-22 11:30:09 +02:00
Benoit Marty 0d1382ab01
Merge pull request #4309 from RiotTranslateBot/weblate-element-android-element-app
Translations update from Weblate
2021-10-22 11:06:42 +02:00
Weblate f75de0b2b7 Merge branch 'origin/develop' into Weblate. 2021-10-22 08:00:00 +00:00
Glandos 7aa860b1fa Translated using Weblate (French)
Currently translated at 100.0% (34 of 34 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fr/
2021-10-22 07:59:55 +00:00