3337 commits

Author	SHA1	Message	Date
ganfra	f96485c493	Timeline: use json directly to be a bit more speedy (those methods are called a lot)	2021-09-09 19:06:09 +02:00
Onuray Sahin	3bd392a55d	Code review fixes.	2021-09-08 13:44:52 +03:00
Onuray Sahin	1df867f345	Fix rendering voice message if the waveform data is corrupted.	2021-09-08 13:20:56 +03:00
Benoit Marty	377c4e00a3	Merge pull request #3954 from vector-im/dependabot/gradle/com.android.tools.build-gradle-7.0.2 ... Bump gradle from 4.2.2 to 7.0.2	2021-09-03 12:11:52 +02:00
Valere	9687a59371	Code review	2021-09-02 11:34:08 +02:00
Valere	97114b4f48	cleaning	2021-09-02 11:34:08 +02:00
Valere	0bcd363677	Cleaning	2021-09-02 11:34:08 +02:00
Valere	5297512f87	Support Space explore pagination	2021-09-02 11:34:08 +02:00
Benoit Marty	616e5b17f0	Fix warning ... provider#androidx.work.impl.WorkManagerInitializer was tagged at AndroidManifest.xml:16 to remove other declarations but no other declaration present	2021-09-02 09:43:39 +02:00
Valere	ec77006ddf	FIx / bad format of restricted join rule	2021-09-01 17:15:37 +02:00
yostyle	d579670080	Add password matrix errors	2021-09-01 10:30:20 +02:00
Benoit Marty	32bad57536	Cleanup	2021-08-31 11:50:23 +02:00
Benoit Marty	d304469903	Merge branch 'develop' into develop	2021-08-30 14:25:13 +02:00
Benoit Marty	23e3241b95	Merge pull request #1809 from dkter/conversation-features ... Support Android 11 Conversation features	2021-08-30 14:15:42 +02:00
Benoit Marty	2a89e2b4ac	Merge pull request #3908 from vector-im/feature/fga/fix_jitsi_widget ... Fix Jitsi-hosted jitsi conferences not loading	2021-08-30 13:57:39 +02:00
Benoit Marty	65c8ae3597	Merge pull request #3739 from vector-im/feature/bca/accept_unbound_3pid_invite ... support email invite	2021-08-27 19:02:42 +02:00
Benoit Marty	5b2478a34f	Merge pull request #3894 from vector-im/feature/dla/keyword_notification_settings ... Feature/dla/keyword notification settings	2021-08-27 18:19:17 +02:00
Valere	1ffacd1788	Code review	2021-08-27 17:30:32 +02:00
Valere	819e7c49b0	Code review	2021-08-27 17:30:32 +02:00
Valere	f2ab0987cc	Add change log + cleaning	2021-08-27 17:30:09 +02:00
Valere	69c84a2460	support email invite	2021-08-27 17:30:09 +02:00
Valere	4107d2643c	Merge pull request #3704 from vector-im/feature/bca/promote_restricted ... Promote restricted join rule to admins	2021-08-27 17:27:57 +02:00
Benoit Marty	276b89b8b7	PushRule enabling request is not following the spec	2021-08-27 16:15:08 +02:00
Valere	b408d7346f	Fix / use unstable prefix for room_capabilities	2021-08-27 15:56:07 +02:00
Florian Renaud	7714cc41f7	Attach documentation reference to expired account error	2021-08-27 14:33:12 +02:00
Florian Renaud	1ca4b3b78a	Add expired account error code ... For synapse instances which have activated and configured the email account validity module, an error code (ORG_MATRIX_EXPIRED_ACCOUNT) is triggered for any request authenticated by the user's access token which is expired. This change only add the error code in the matrix SDK but does not handle it for now in the client side. More documentation can be found in the dedicated Synapse plugin module repository: https://github.com/matrix-org/synapse-email-account-validity	2021-08-27 14:28:07 +02:00
ganfra	84e6a67a51	Jitsi widget: refact a bit so we use data instead of url when possible	2021-08-27 14:03:52 +02:00
David Teresi	842ccb12b2	Improve shortcut sorting	2021-08-25 13:41:32 -04:00
David Langley	daaa40b27a	Merge branch 'develop' of github.com:vector-im/element-android into feature/dla/keyword_notification_settings	2021-08-25 17:41:37 +01:00
David Langley	1d767d6e3f	Fix keyword style, preference persistence and add comment to keyword ruleid	2021-08-25 17:38:12 +01:00
Benoit Marty	4ad542f0d3	Merge pull request #3891 from vector-im/fre/when_statement ... Use `when` statement instead of `if`/ `else`	2021-08-25 12:03:31 +02:00
David Langley	fb8c7f6be0	lint	2021-08-24 19:08:27 +01:00
ganfra	2e2deba3ac	Fix message edition is not rendered in e2e rooms after pagination (#3887)	2021-08-24 19:58:54 +02:00
David Langley	3481fc70c7	Cleanup and fix resValue	2021-08-24 16:49:18 +01:00
David Langley	238f772461	Merge branch 'develop' of github.com:vector-im/element-android into feature/dla/keyword_notification_settings	2021-08-24 15:51:23 +01:00
Florian Renaud	07adc43481	Use when statement instead of if/ else	2021-08-24 15:38:33 +02:00
Benoit Marty	c301bcf4b6	Send an empty body for POST rooms/{roomId}/receipt/{receiptType}/{eventId}	2021-08-23 16:49:45 +02:00
Benoit Marty	9fa862ec76	Merge pull request #3711 from vector-im/feature/bma/sendToDevice ... Ensure that txnId is the same if the request is retried	2021-08-23 16:11:33 +02:00
Benoit Marty	4a33fbb635	Merge pull request #3743 from vector-im/florian14/dm_email_invite ... Update Account Data with user matrix id for invited user by email	2021-08-23 16:08:39 +02:00
Onuray Sahin	885a663380	Fix error when sending encrypted message if someone in the room logs out.	2021-08-06 15:23:24 +03:00
David Langley	8d7e3b6544	add keyword checkbox preference and chip/edit text for modificying keywords	2021-08-03 09:52:36 +01:00
Valere	efdaa49e70	Code review	2021-07-30 18:44:25 +02:00
Valere	a7dc7e8d8a	klint	2021-07-30 18:44:14 +02:00
Valere	88fec379c4	Cleaning	2021-07-30 18:44:14 +02:00
Valere	5adceaca23	Code quality	2021-07-30 18:44:14 +02:00
Valere	2f16a7fff3	Restricted room mgmt when supported	2021-07-30 18:43:34 +02:00
Valere	6c2a917d9f	WIP	2021-07-30 18:43:34 +02:00
Onuray Sahin	c6bd6e4961	Merge pull request #3598 from vector-im/feature/ons/voice_message ... Voice Message	2021-07-30 17:24:17 +03:00
Benoit Marty	7cd90b0b14	Merge pull request #3760 from vector-im/feature/bma/otk1 ... 2 small fixes	2021-07-30 12:55:57 +02:00
Florian Renaud	0a08746937	Set DirectMessagesContent immutable	2021-07-30 11:20:35 +02:00