1638 Commits

Author	SHA1	Message	Date
Benoit Marty	f6cbc15cf7	Several fixes on room creation collpasing events (Fixes #1309) ... - do not collapse room member events - collapse other type of event: topic, alias, canonical alias, powel level - Use correct user name for collapsed version (should be fixed twice due to the previous change of excluding some room member events) - align "join" and "left" string with Riot-Web	2020-04-30 12:52:21 +02:00
Benoit Marty	7322144dc8	Remove duplicated strings	2020-04-30 12:15:26 +02:00
Valere	7b20db64a5	Merge branch 'develop' into feature/e2e_timeline_decoration	2020-04-30 12:01:44 +02:00
Valere	429c634ed9	Merge pull request #1308 from vector-im/feature/fix_dm_shield_logic ... Fix / Move DM shield rules to task	2020-04-30 12:00:18 +02:00
Valere	05230a6afa	Code review	2020-04-30 11:38:32 +02:00
Valere	43eb804b23	Merge pull request #1303 from vector-im/feature/xs_old_new_session_detection ... Feature/xs old new session detection	2020-04-30 11:23:15 +02:00
Valere	6ea38c7eb0	Fix / Move DM shield rules to task	2020-04-30 10:55:25 +02:00
Valere	0d0af6906e	Code review	2020-04-30 10:10:56 +02:00
Valere	f0a9be2ec7	Better session detection	2020-04-29 18:46:36 +02:00
Valere	8955e5461c	Add retry to sendToDeviceTask	2020-04-29 18:45:51 +02:00
Valere	087ff1c041	Fix / race when receive accept in sending start in to device	2020-04-29 18:44:25 +02:00
Valere	7b46c49ded	Fix / missing primary key for migration	2020-04-29 16:35:50 +02:00
Valere	da5672d229	Fix / ensure ux aware of wait	2020-04-29 16:18:01 +02:00
Valere	0f00597444	Fix / Regression on non e2e device ... + migrate to new rx objects	2020-04-29 12:35:22 +02:00
Valere	a806f70b35	New security alert to review old sessions	2020-04-29 12:04:59 +02:00
Benoit Marty	67f07bd1bb	Merge pull request #1297 from vector-im/feature/xsigning_trust_optimization ... Feature/xsigning trust optimization	2020-04-29 10:32:29 +02:00
Benoit Marty	4dc0b00569	Import string from Matrix SDK	2020-04-28 23:54:35 +02:00
ganfra	8942ce964a	Fix android test not compiling	2020-04-28 19:09:20 +02:00
ganfra	43055964ba	Crypto store : avoid copying before mapping to other data	2020-04-28 16:26:04 +02:00
Benoit Marty	b4247c89e4	Make fun internal	2020-04-28 14:15:50 +02:00
ganfra	4e8177f738	Fix lint	2020-04-28 13:10:44 +02:00
Valere	8871390167	Code review	2020-04-28 12:25:50 +02:00
ganfra	fc86e7e1f6	ShieldTrust: use only active members	2020-04-28 11:00:41 +02:00
ganfra	21912c290a	XSigning keys: use json instead of object serialization	2020-04-28 10:59:51 +02:00
Benoit Marty	8bd4cc8f54	Merge pull request #1277 from vector-im/feature/sso ... Use correct sso url	2020-04-27 14:36:37 +02:00
Benoit Marty	a233e9b0a0	Avoid code duplication, and improve readability	2020-04-27 14:25:45 +02:00
Valere	114bce5f64	Fix / DB crash due to deserializaion	2020-04-24 16:50:56 +02:00
Valere	20e5ebc88b	Decorate timeline with e2e warning	2020-04-24 16:50:56 +02:00
Benoit Marty	8daf72a4b0	Use correct URL for SSO connection (#1178)	2020-04-24 15:54:02 +02:00
Benoit Marty	51eb2cda95	Move some constants to the Matrix SDK	2020-04-24 15:53:30 +02:00
Benoit Marty	af0b798ef1	Ensure Timber log output when running tests ... to squash	2020-04-24 13:38:28 +02:00
Benoit Marty	51be8d5ed5	Remove previous temporary solution	2020-04-24 13:26:25 +02:00
Benoit Marty	270bed5013	EventBus logs using Timber	2020-04-24 11:57:49 +02:00
Benoit Marty	20b3c33fb0	Remove bad comment	2020-04-24 11:57:49 +02:00
Benoit Marty	b2aaf1cca1	CurlLoggingInterceptor now uses Timber to log	2020-04-24 11:57:49 +02:00
Benoit Marty	4ee13b6fa1	Merge branch 'develop' into feature/unwedging	2020-04-23 18:20:09 +02:00
Valere	736905edf8	Merge pull request #1269 from vector-im/feature/complete_security_hide_4s ... Hide Use recovery key when 4S is not setup	2020-04-23 18:03:14 +02:00
Benoit Marty	e8a91eab88	Merge pull request #1265 from vector-im/feature/deactivate ... Deactivate account using password	2020-04-23 17:30:08 +02:00
Valere	7e0591ffee	Hide Use recovery key when 4S is not setup	2020-04-23 11:14:20 +02:00
Valere	e37dd547b8	code review	2020-04-22 18:50:59 +02:00
Benoit Marty	671c1259af	Merge pull request #1239 from waylon531/develop ... Use a bigger thread pool	2020-04-22 18:23:37 +02:00
Benoit Marty	03b9774c56	ktlint	2020-04-22 17:56:13 +02:00
Valere	9b320ed3c7	Fix unwedging	2020-04-22 15:40:59 +02:00
Benoit Marty	5755d5bfaa	Deactivate account: unit test and cleanup	2020-04-22 14:36:01 +02:00
Benoit Marty	ff320fec55	Move internal class to internal package	2020-04-21 20:47:49 +02:00
Benoit Marty	8c8a84b039	Account deactivation: the task does the cleanup	2020-04-21 20:41:10 +02:00
Benoit Marty	045e3d7bae	Account deactivation (with password only) (#35)	2020-04-21 20:31:54 +02:00
Benoit Marty	eca3bf0817	typo	2020-04-21 13:49:36 +02:00
Benoit Marty	c39a0e4fd5	timout -> timeout	2020-04-21 00:29:44 +02:00
Benoit Marty	c1acb1af66	Add integration test for change password feature	2020-04-21 00:23:01 +02:00