Commit graph

16564 commits

Author SHA1 Message Date
Valere
9eb0473d74 better logs 2022-03-04 19:21:19 +01:00
Valere
ade16a0aa1 protect race on prekey + logs 2022-03-04 19:21:19 +01:00
Valere
9b3c5d2153 Improve inbound group session cache + mutex 2022-03-04 19:21:19 +01:00
Valere
c97de48474 Added e2ee sanity tests 2022-03-04 19:21:19 +01:00
Valere
24c51ea41a Clean megolm import code 2022-03-04 19:21:19 +01:00
Valere
87d930819a Fix test compilation 2022-03-04 19:21:19 +01:00
Valere
9df5f17132 protect olm account access 2022-03-04 19:21:19 +01:00
Valere
33f9bc52cb Protect olm session from concurrent access 2022-03-04 19:21:19 +01:00
Valere
10ea166b2a Extract olm cache store 2022-03-04 19:21:19 +01:00
Michael Kaye
8e39247c4d I give up for the weekend 2022-03-04 18:00:20 +00:00
Michael Kaye
1ad3e7cc9d Frustration at artifact handling vs what's in docs. 2022-03-04 16:35:46 +00: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
Michael Kaye
57bbec4ffd
Merge pull request #5388 from vector-im/michaelk/format_unit_test_results
Format unit test results
2022-03-04 15:29:15 +00:00
Michael Kaye
96168929ff Tweak upload/download of codecov xml file 2022-03-04 15:15:52 +00:00
Onuray Sahin
2c611790db
Merge branch 'develop' into feature/ons/voice_message_scrubbing 2022-03-04 18:03:44 +03:00
Michael Kaye
2dedad1cf2 Address review points from adam 2022-03-04 15:03:12 +00:00
Michael Kaye
662f72fde8 Remove unneeded code, retaining a comment for how to exclude certain projects 2022-03-04 15:01:24 +00:00
Onuray Sahin
4cb432e497 Do not allow to flow RTL after summarized, playback time always flows LTR. 2022-03-04 17:47:34 +03:00
Onuray Sahin
e09b123a91 Changelog added. 2022-03-04 17:21:00 +03:00
Onuray Sahin
601f10a6fb Support ltr and rtl flow of the recording waveform. 2022-03-04 17:16:09 +03:00
Onuray Sahin
aae75ce52f Always stop all voice actions and media player if app enters to the background. 2022-03-04 16:54:56 +03:00
Onuray Sahin
5168d715ce Support scrolling playback on recorded audio before sending. 2022-03-04 16:21:28 +03:00
SpiritCroc
37a68b4367 [merge] Fix ic_add_reaction color
Change-Id: Ieeff366c672499ed14291fe64338bd0d41332585
2022-03-04 12:11:30 +01:00
SpiritCroc
3d57cb880c Unread line: follow unread counter color
Change-Id: Ia3cd51364517276cfc438fe0f7700d11de7ff00a
2022-03-04 11:57:58 +01:00
SpiritCroc
0a4f07f07f Automatic SchildiChat string correction
Change-Id: I3b93d37a7ac0874203cb10e16693476c01b5fe5b
2022-03-04 11:43:01 +01:00
SpiritCroc
d77c42f8c1 Automatic upstream merge postprocessing
Change-Id: Iaf674a4d25857de93b86e4162b51688ed113553f
2022-03-04 11:43:00 +01:00
SpiritCroc
161780899e [merge] Make unread indicator accent color as before
Change-Id: I511adcfd2be159f1ba392525af6e60196a774901
2022-03-04 11:42:49 +01:00
SpiritCroc
2f5df9133f Merge tag 'v1.4.2' into sc
Change-Id: I8a96211645ff31284897d818ce93c7b5571fbd0f

Conflicts:
	library/ui-styles/src/main/res/values/styles_timeline.xml
	library/ui-styles/src/main/res/values/theme_black.xml
	library/ui-styles/src/main/res/values/theme_dark.xml
	library/ui-styles/src/main/res/values/theme_light.xml
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStoreMigration.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MergedHeaderItemFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsBaseMessageItem.kt
	vector/src/main/java/im/vector/app/features/html/PillImageSpan.kt
	vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
	vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
	vector/src/main/res/layout/item_room.xml
	vector/src/main/res/values/config.xml
2022-03-04 11:42:30 +01:00
SpiritCroc
ab9bf0cb7d [TMP] Automatic upstream merge preparation
Change-Id: I643396f8586b594412dbd97284256165fd843f7b
2022-03-04 10:48:35 +01:00
SpiritCroc
5331ad8911 Automatic revert to unchanged upstream strings, pt.1
Change-Id: I2cf821d62dab6a1c5bcbf7a3c124e57bd49ab60e
2022-03-04 10:48:35 +01:00
Michael Kaye
d4bf38f428
Merge pull request #5391 from vector-im/michaelk/sonaqube_nightly
Run sonarqube as part of nightly build
2022-03-04 09:25:18 +00:00
SpiritCroc
dd0037509e Apply corner roundness to image-related drawables
Background outline and time overlay

Change-Id: If6715bf11489609a9ad2aad831db9ee608c803b6
2022-03-04 10:21:40 +01:00
SpiritCroc
b56c1a3b0c Fix image corner radius for SC bubbles
Change-Id: I8cb2515f3f7985cf12ecc2b4a368f663cacfc0d0
2022-03-04 10:06:16 +01:00
ClaireG
2a9e582db5
Merge pull request #5405 from vector-im/cgizard/ISSUE-5402
[Create private room] Picture doesn't not displayed
2022-03-03 22:40:26 +01:00
Michael Kaye
2d5b25cfad Remove the printing of file name to the log as it's doubling up information. 2022-03-03 20:39:41 +00:00
Michael Kaye
9fe04ac5b8 Remove exclusions (for now).
We can merge this PR without and re-add afterwards the only ones we want.
2022-03-03 20:26:33 +00:00
Michael Kaye
cb32124fd4 Fix typo in name of action 2022-03-03 18:28:13 +00: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
ariskotsomitopoulos
daafddbe71 fix Realm crash 2022-03-03 19:10:40 +02:00
Onuray Sahin
3bd4a4ccd3 Fix voice recorder start/pause states. 2022-03-03 19:54:13 +03: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
Michael Kaye
76844b1572 Run codecoverage and pass to sonarqube upload for processing. 2022-03-03 16:34:54 +00:00
Michael Kaye
49fbfe6811 Better codecov based on ouchadam's suggestion 2022-03-03 16:34:54 +00:00
Michael Kaye
105f3dd93d Correct name of environment variable 2022-03-03 16:34:26 +00:00
SpiritCroc
fe5eaece47 Setting for more rounded bubbles
Closes https://github.com/SchildiChat/SchildiChat-android/issues/48

Change-Id: I51dabc18c1542dcd4b8d12769fe1cc76573441c5
2022-03-03 17:20:06 +01:00
Michael Kaye
3364868365 Use environment variable that is tied to project property 2022-03-03 15:05:39 +00:00
ariskotsomitopoulos
39bd437f75 Temp fix Realm crash 2022-03-03 17:04:08 +02:00
Onuray Sahin
4254f46065 Support scrolling playback on timeline. 2022-03-03 17:59:51 +03: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
Benoit Marty
7a1322baf7
Merge pull request #5415 from vector-im/feature/adm/missing-allowed-depenency-groups
Adding missing dependency allowances
2022-03-03 14:57:37 +01:00