Commit Graph

9027 Commits

Author SHA1 Message Date
Adam Brown ab9e4405ce using correct label for the avatar capability debug override 2022-03-14 11:54:42 +00:00
Adam Brown 4b9b177104 forwarding to the profile picture flow when display name changing isn't supported but pictures are when personalising the profile 2022-03-14 11:54:42 +00:00
Adam Brown b5778bd6c5 formatting 2022-03-14 11:54:42 +00:00
Adam Brown 716928d9d2 dynamically switching the onboarding flow based on the capabilities of the homeserver
- when avatars can't be changed we complete the personlisation flow
2022-03-14 11:54:42 +00:00
Adam Brown 46be481eda hiding the toolbar back button and handling system back as take the user home if the display name personalisation is not supported 2022-03-14 11:54:42 +00:00
Adam Brown a033243475 adding test around account creation via dummy 2022-03-14 11:54:42 +00:00
Adam Brown 537c2f56a1 dynamically changing the account created layout based on if the homeserver supports personalisation 2022-03-14 11:54:42 +00:00
Adam Brown 3df4f1e099 adding entry points for injecting and overriding the homeserver capabilities 2022-03-14 11:54:42 +00:00
Adam Brown 50740b1449 extracting method for the handling of the profile picture selection 2022-03-14 11:54:42 +00:00
Adam Brown 10e4fd1707 updating upstream avatar on profile picture save and continue step
- moves the personalisation state to a dedicated model to allow for back and forth state restoration
2022-03-14 11:54:42 +00:00
Adam Brown 7ded9007db add click handling for the display name actions 2022-03-14 11:54:42 +00:00
Adam Brown 0685b57720 add click handling for the display name actions 2022-03-14 11:54:42 +00:00
Adam Brown 6c4381fda5 adding dedicated camera icon for choosing profile picture 2022-03-14 11:54:42 +00:00
Adam Brown 567fd9a13d extracting method for the handling of the profile picture selection 2022-03-14 11:54:42 +00:00
Adam Brown 232524ddc3 adding barebones profile picture fragment with ability to select a user avatar 2022-03-14 11:54:42 +00:00
Adam Brown 1c80914832 adding tests around the onboarding view model
- cases for the personalisation and display name actions
2022-03-14 11:54:42 +00:00
Adam Brown 074cde4519 add click handling for the display name actions 2022-03-14 11:54:41 +00:00
Adam Brown 4a1bf11168 adding base choose name fragment with UI 2022-03-14 11:54:41 +00:00
ariskotsomitopoulos fef36d9334 Temporarily fix develop crash 2022-03-14 12:25:11 +01:00
ariskotsomitopoulos d215f03798 Merge branch 'develop' into feature/aris/thread_live_thread_list 2022-03-14 12:02:04 +01:00
ericdecanini 2176129b11 Moves additional top space usage to bubble view 2022-03-14 11:46:48 +01:00
Maxime Naturel 8bb0a5cb4c Fixing wrong remove of import 2022-03-14 11:15:19 +01:00
Maxime Naturel 0942c6d648 Removing some with() code pattern 2022-03-14 11:15:19 +01:00
Maxime Naturel a826a50c10 Renaming observe item count method 2022-03-14 11:15:19 +01:00
Maxime Naturel f327eaa3f1 Adding item counter in add existing room to space screen 2022-03-14 11:15:19 +01:00
Maxime Naturel 20749e04cb Fix coding style 2022-03-14 11:15:18 +01:00
Maxime Naturel 30c6518630 Updating remaining category item 2022-03-14 11:15:18 +01:00
Maxime Naturel 3d27d9d2d2 Fix filtering use case 2022-03-14 11:15:18 +01:00
Maxime Naturel c79aa267c3 Fix switching space use case 2022-03-14 11:15:18 +01:00
Maxime Naturel d5345160fa Adding TODO 2022-03-14 11:15:18 +01:00
Maxime Naturel ad9d36e58c Setting item count text only when > 0 2022-03-14 11:15:17 +01:00
Maxime Naturel 53c24d20b0 Moving notification badge on the right side 2022-03-14 11:15:17 +01:00
Maxime Naturel 0aaa650ac3 Using flow to show items counter 2022-03-14 11:15:17 +01:00
Maxime Naturel c7dae341c0 (DRAFT) Room counter flow 2022-03-14 11:15:17 +01:00
Maxime Naturel eb38c9d835 Fix remove of imports 2022-03-14 11:15:17 +01:00
Maxime Naturel b1d1090d1d Adding number of items (UI part) 2022-03-14 11:15:17 +01:00
Maxime Naturel 70481e3ba3 Changing style of header 2022-03-14 11:15:16 +01:00
Claire G 025dcc8d88 Fix bug: readReceipt in wrong order 2022-03-14 10:28:42 +01:00
bmarty 5dfa362345 Sync analytics plan 2022-03-14 00:05:30 +00:00
dependabot[bot] 2d5638baaf
Bump libphonenumber from 8.12.44 to 8.12.45
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.44 to 8.12.45.
- [Release notes](https://github.com/google/libphonenumber/releases)
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md)
- [Commits](https://github.com/google/libphonenumber/compare/v8.12.44...v8.12.45)

---
updated-dependencies:
- dependency-name: com.googlecode.libphonenumber:libphonenumber
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-03-10 23:09:19 +00:00
ariskotsomitopoulos 34cfdfb6fe Merge branch 'develop' into feature/aris/thread_live_thread_list 2022-03-10 18:48:41 +02:00
Benoit Marty 26617988f2 Add colors for shield vector drawable 2022-03-10 17:15:19 +01:00
ariskotsomitopoulos a758ad71e6 Add is_falling_back support for rich thread replies
Enhance thread awareness handler so normal replies with thread disabled will be visible in te appropriate thread
Fix conflicts
2022-03-10 17:51:02 +02:00
Claire G 8f0d6a1adc use colorPrimary for tint 2022-03-10 14:30:15 +01:00
Benoit Marty 551b827753
Merge pull request #5384 from p1gp1g/bubble-space
Add padding before first own message
2022-03-10 14:09:23 +01:00
Benoit Marty c339e10c07
Merge pull request #5436 from vector-im/feature/nfe/space_highlight
change selected space highlight
2022-03-10 13:28:08 +01:00
Benoit Marty d83d5f9828
Merge pull request #5467 from vector-im/feature/bma/unused_resources_all
Remove unused resources
2022-03-10 13:03:27 +01:00
ariskotsomitopoulos 21111922e6 Merge branch 'develop' into feature/aris/thread_live_thread_list
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/threads/FetchThreadTimelineTask.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt
2022-03-10 12:55:13 +02:00
Benoit Marty ce4ad8819a
Merge pull request #5380 from vector-im/feature/bca/crypto_fix_rolling_uisi
Refactoring for safer olm and megolm session usage
2022-03-10 11:13:07 +01:00
ariskotsomitopoulos 03f293f216 Remove io.element.thread and add stable m.thread prefix 2022-03-10 12:06:02 +02:00
Adam Brown ecb49b3b27 Merge branch 'main' into develop 2022-03-09 16:13:15 +00:00
Adam Brown 60bc3b09b7 updating to version 1.4.6 in prep for next release cycle 2022-03-09 16:03:00 +00:00
Maxime NATUREL f12afe0ef0
Merge pull request #5411 from vector-im/feature/mna/PSF-735-sharing-options-view
#5395: Location sharing options view
2022-03-09 16:10:46 +01:00
Benoit Marty 3f17cf595f Remove unused resources 2022-03-09 14:55:40 +01:00
Benoit Marty 7d78c8819c Ignore some other lint warnings 2022-03-09 14:40:59 +01:00
Adam Brown 57ffc56869
Merge pull request #5472 from vector-im/feature/aris/fix_5463_parcelising_reaction_crash
Fix reactions summary crash
2022-03-09 13:35:51 +00:00
ariskotsomitopoulos 84b3f63279 Format code 2022-03-09 12:55:25 +02:00
ariskotsomitopoulos c24944b1f2 Fix reactions summary crash 2022-03-09 12:52:34 +02:00
Onuray Sahin 9b7e329000 Fix lint error. 2022-03-09 13:31:29 +03:00
Benoit Marty e0914781fc
Merge pull request #5435 from vector-im/feature/nfe/space_menu_amend_copy
Amend spaces menu to have consistent copy
2022-03-09 11:13:46 +01:00
Adam Brown 662e9592a0
fixing overlapping room image and title (#5469)
- the room title was missing constraints for the different types of leading icons
2022-03-09 10:11:53 +00:00
Benoit Marty 67a24b38cb Avoid stable prefix 2022-03-09 10:48:35 +01:00
Benoit Marty 20c1886fed Support both unstable and stable prefixes.
Author: Onuray
2022-03-09 10:40:43 +01:00
Maxime Naturel 2bdafde965 Fix wrong click listener on the current available option 2022-03-09 09:46:52 +01:00
Maxime Naturel 89db867ab3 Fix attributes style id conflicts 2022-03-09 09:46:52 +01:00
Maxime Naturel 6515e457b5 Ignore unused strings to be deleted 2022-03-09 09:46:52 +01:00
Maxime Naturel 046d906f97 Moving view attributes into uikit dedicated file 2022-03-09 09:46:52 +01:00
Maxime Naturel 9adb87bdb4 Renaming picker view method 2022-03-09 09:46:52 +01:00
Maxime Naturel 442d722980 Fix comment form in enum 2022-03-09 09:46:52 +01:00
Maxime Naturel 3aa1032a7a Rollback wrong sharing options 2022-03-09 09:46:52 +01:00
Maxime Naturel 82515cf095 Remove usage of strings to be deleted 2022-03-09 09:46:52 +01:00
Maxime Naturel 9b6811c915 View extension methods to tint current background 2022-03-09 09:46:52 +01:00
Maxime Naturel 7cad30e6bb Use user color for pin background 2022-03-09 09:46:52 +01:00
Maxime Naturel 8f362d83cd Set option to user current location 2022-03-09 09:46:52 +01:00
Maxime Naturel edc77b0c17 Fixing code syntax 2022-03-09 09:46:51 +01:00
Maxime Naturel e4c9acde77 Setting colorSurface for background 2022-03-09 09:46:51 +01:00
Maxime Naturel d36409d475 Renaming package to option 2022-03-09 09:46:51 +01:00
Maxime Naturel b11f7f20e1 Adding user avatar and color for current location option 2022-03-09 09:46:51 +01:00
Maxime Naturel 42fca9bd6f Fixing ripple effect 2022-03-09 09:46:51 +01:00
Maxime Naturel 8bcc594320 Changing color of the live location icon 2022-03-09 09:46:47 +01:00
Maxime Naturel fb764028c9 Adding dividers 2022-03-09 09:45:15 +01:00
Maxime Naturel 0707877b3c Using correct string resources for options 2022-03-09 09:45:15 +01:00
Maxime Naturel 3bbb7167f1 Adding icon for live location 2022-03-09 09:45:00 +01:00
Maxime Naturel 4586426958 Adding other options 2022-03-09 09:44:06 +01:00
Maxime Naturel 55c6383074 Set options method 2022-03-09 09:44:06 +01:00
Maxime Naturel a98f502c01 Adding custom view for options picker 2022-03-09 09:44:06 +01:00
sim 17d58f24d2 Add padding before our first message
Signed-off-by: sim <git@sgougeon.fr>
2022-03-08 17:26:23 +01:00
Element Translate Bot 2048b859c5
Translations update from Weblate (#5458)
* Translated using Weblate (Czech)

Currently translated at 100.0% (2157 of 2157 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/cs/

* Translated using Weblate (Hungarian)

Currently translated at 100.0% (2157 of 2157 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/hu/

* Translated using Weblate (Indonesian)

Currently translated at 100.0% (2157 of 2157 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/id/

* Translated using Weblate (Japanese)

Currently translated at 97.4% (2103 of 2157 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ja/

* Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (2157 of 2157 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pt_BR/

* Translated using Weblate (Slovak)

Currently translated at 98.8% (2132 of 2157 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sk/

* Translated using Weblate (Swedish)

Currently translated at 100.0% (2157 of 2157 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sv/

* Translated using Weblate (Ukrainian)

Currently translated at 100.0% (2157 of 2157 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/

* Translated using Weblate (Swedish)

Currently translated at 100.0% (51 of 51 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/sv/

* Translated using Weblate (Japanese)

Currently translated at 54.9% (28 of 51 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/ja/

* Translated using Weblate (Japanese)

Currently translated at 98.0% (2116 of 2157 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ja/

* Translated using Weblate (Japanese)

Currently translated at 98.0% (2116 of 2157 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ja/

* Translated using Weblate (German)

Currently translated at 99.8% (2153 of 2157 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/

* Translated using Weblate (Italian)

Currently translated at 100.0% (2157 of 2157 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/it/

* Translated using Weblate (Japanese)

Currently translated at 98.3% (2121 of 2157 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ja/

* Translated using Weblate (Polish)

Currently translated at 93.8% (2025 of 2157 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pl/

* Translated using Weblate (Slovak)

Currently translated at 98.9% (2134 of 2157 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sk/

* Translated using Weblate (Albanian)

Currently translated at 99.4% (2145 of 2157 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sq/

* Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2157 of 2157 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hant/

* Translated using Weblate (German)

Currently translated at 100.0% (51 of 51 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/de/

* Translated using Weblate (French)

Currently translated at 100.0% (51 of 51 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fr/

* Translated using Weblate (Hebrew)

Currently translated at 81.2% (1753 of 2157 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/he/

* Translated using Weblate (Hebrew)

Currently translated at 81.2% (1753 of 2157 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/he/

* Translated using Weblate (Albanian)

Currently translated at 100.0% (51 of 51 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/sq/

* Translated using Weblate (Japanese)

Currently translated at 98.3% (2121 of 2157 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ja/

* Translated using Weblate (Slovak)

Currently translated at 99.2% (2140 of 2157 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sk/

* Translated using Weblate (Arabic)

Currently translated at 30.5% (659 of 2157 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ar/

* Translated using Weblate (Estonian)

Currently translated at 99.9% (2155 of 2157 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/et/

* Translated using Weblate (Finnish)

Currently translated at 80.2% (1730 of 2157 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fi/

* Translated using Weblate (French)

Currently translated at 99.9% (2156 of 2157 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fr/

* Translated using Weblate (Hungarian)

Currently translated at 99.8% (2154 of 2157 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/hu/

* Translated using Weblate (Japanese)

Currently translated at 98.6% (2128 of 2157 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ja/

* Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (2157 of 2157 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pt_BR/

* Translated using Weblate (Slovak)

Currently translated at 99.3% (2143 of 2157 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sk/

* Translated using Weblate (Slovak)

Currently translated at 99.3% (2143 of 2157 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sk/

* Translated using Weblate (Hungarian)

Currently translated at 98.0% (50 of 51 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/hu/

* Translated using Weblate (Hebrew)

Currently translated at 85.5% (1846 of 2157 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/he/

* Translated using Weblate (Hebrew)

Currently translated at 85.5% (1846 of 2157 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/he/

* Translated using Weblate (Japanese)

Currently translated at 62.7% (32 of 51 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/ja/

Co-authored-by: waclaw66 <waclaw66@seznam.cz>
Co-authored-by: Szimszon <github@oregpreshaz.eu>
Co-authored-by: Linerly <linerly@protonmail.com>
Co-authored-by: Suguru Hirahara <ovestekona@protonmail.com>
Co-authored-by: lvre <7uu3qrbvm@relay.firefox.com>
Co-authored-by: Jozef Gaal <preklady@mayday.sk>
Co-authored-by: LinAGKar <linus.kardell@gmail.com>
Co-authored-by: Ihor Hordiichuk <igor_ck@outlook.com>
Co-authored-by: oksya8and8 <darknessyasuko@protonmail.com>
Co-authored-by: libexus <libexus@gmail.com>
Co-authored-by: random <dictionary@tutamail.com>
Co-authored-by: Arusekk <arek_koz@o2.pl>
Co-authored-by: Besnik Bleta <besnik@programeshqip.org>
Co-authored-by: Jeff Huang <s8321414@gmail.com>
Co-authored-by: Glandos <bugs-github@antipoul.fr>
Co-authored-by: SPiRiT <such.a.lost.spirit@gmail.com>
Co-authored-by: sagi korin <sagi.korin@hot.net.il>
Co-authored-by: Peter Vágner <pvdeejay@gmail.com>
Co-authored-by: Zet <abidin24@disroot.org>
Co-authored-by: Priit Jõerüüt <riot@joeruut.com>
Co-authored-by: Tuomas Hietala <tuomas.hietala@iki.fi>
Co-authored-by: notramo <notramo@protonmail.com>
Co-authored-by: Nícolas F. R. A. Prado <n@nfraprado.net>
Co-authored-by: Edward Gera <Eduard.Gerasimuk@hot.net.il>
Co-authored-by: Ilan Feler <ilanf@mail.com>
Co-authored-by: Weblate <noreply@weblate.org>
2022-03-08 16:06:01 +00:00
Benoit Marty b867e5f072 Iterate on badge / unread indicator color (#5332) 2022-03-08 14:52:10 +01:00
Onuray Sahin 9fa285e6ca Support showing push notifications for poll start events. 2022-03-08 14:06:28 +03:00
Adam Brown 9a02543afd
FTUE - Choose a display picture (#5323)
* adding tests around the onboarding view model
- cases for the personalisation and display name actions

* adding base choose name fragment with UI

* add click handling for the display name actions

* adding tests around the onboarding view model
- cases for the personalisation and display name actions

* adding barebones profile picture fragment with ability to select a user avatar

* extracting uri filename resolving to a class which can be injected
- includes tests

* updating upstream avatar on profile picture save and continue step
- moves the personalisation state to a dedicated model to allow for back and forth state restoration

* adding test case for skipping profile picture setting

* taking the profile loading into account when rendering the onboarding loading

* extracting method for the handling of the profile picture selection

* adding dedicated camera icon for choosing profile picture

* adding toolbar to back to profile picture page
- this toolbar will fade in with the fragment as it sits at the fragment level, probably worth revisiting once more pages have a toolbar

* changing edit/add picture icon based on if we're already selected an image

* making use of debounced clicks to avoid potential extra clicks

* making the avatar height and camera icon relative percentage based
- also makes the avatar itself clicking, including a foreground ripple

* fixing formatting

* making use of fake session id for user id assertion

* using a real  matrix id syntax for the fake session user id

* removing duplicated dimens

* using self closing imageview tag
2022-03-07 14:07:22 +00:00
NIkita Fedrunov 33246be2a5 change selected space highlight 2022-03-07 09:58:40 +01:00
NIkita Fedrunov 8732c6fe42 Amend spaces menu to have consistent copy 2022-03-07 08:32:31 +01:00
ariskotsomitopoulos bce5bc8389 Fix wrong versioning regex pattern
Add MSC3440 support using /version/ and /capabilities
2022-03-05 17:13:02 +02:00
Valere 33f9bc52cb Protect olm session from concurrent access 2022-03-04 19:21:19 +01:00
Ahmed Radhouane Belkilani bcdf004082
Update the top bar in a room (#5213)
Remove typing message notification from room toolbar.

Signed-off-by: Ahmed Radhouane Belkilani <arbelkilani@gmail.com>
2022-03-04 16:38:53 +01:00
Benoit Marty 1690a0b2cf
giving avatar/display name error dialogs human readable error messages (#5419)
- reuses the ErrorDialog logic which translates exceptions to human readable strings
2022-03-03 18:29:39 +01:00
Adam Brown 54e23a2c55 giving avatar/display name error dialogs human readable error messages
- reuses the ErrorDialog logic which translates exceptions to human readable strings
2022-03-03 16:37:59 +00:00
Yoan Pintas 6e6b04c57e
Merge pull request #4498 from vector-im/yostyle/fix_strandhogg
Override task affinity to prevent unknown activities running in our app tasks.
2022-03-03 15:05:29 +01:00
ariskotsomitopoulos e4282e5f29 Merge branch 'develop' into feature/aris/thread_live_thread_list
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/DefaultRelationService.kt
2022-03-03 13:56:59 +02:00