2123 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Valere	dedc622140	Merge branch 'sdk_reference_aggregation' into dm_verif_incoming_timeline	2019-12-12 15:55:01 +01:00
Valere	9842cac504	More explicit val naming	2019-12-12 15:29:56 +01:00
Valere	35404b9a7f	Fix merge	2019-12-12 15:05:13 +01:00
Valere	0afcb60e7d	fix rebase	2019-12-12 14:31:01 +01:00
Valere	cb595177a9	Fix test compilation	2019-12-12 13:37:17 +01:00
Valere	cb4d52c9fb	Aggregate Event References for DM verifications	2019-12-12 13:37:17 +01:00
Valere	d0a3b4663e	FIx / room transport was not updating state	2019-12-12 13:37:17 +01:00
Valere	f53b99a423	rebase	2019-12-12 13:37:17 +01:00
Valere	6da0693488	Convert KeyVerificationStart to data class	2019-12-12 13:37:17 +01:00
Valere	ea817ff1c5	fix rebase	2019-12-12 12:04:38 +01:00
Valere	62f0c6edc0	Fix / Use transport to start verification	2019-12-12 12:04:38 +01:00
Valere	e71ad0e515	Simple strategy to Ignore old verification messages	2019-12-12 12:03:59 +01:00
Valere	553604423e	Support verification using room transport	2019-12-12 12:03:42 +01:00
Valere	be723256d3	FIx / room transport was not updating state	2019-12-12 10:49:42 +01:00
Valere	819d7182bb	rebase	2019-12-12 10:49:42 +01:00
Valere	0a2ffdbdf1	Convert KeyVerificationStart to data class	2019-12-12 10:49:42 +01:00
Valere	4ac7331f3d	fix rebase	2019-12-12 10:49:42 +01:00
Valere	7fc57bdf9b	Fix / Use transport to start verification	2019-12-12 10:49:42 +01:00
Valere	d370f6d7c8	Simple strategy to Ignore old verification messages	2019-12-12 10:49:42 +01:00
Valere	46ef442139	cleaning	2019-12-12 10:49:42 +01:00
Benoit Marty	5f3dc73440	Code review	2019-12-12 10:49:42 +01:00
Valere	6137a88a6f	Support verification using room transport	2019-12-12 10:49:42 +01:00
Valere	82af848c33	Fix / Verification Request Local Echo	2019-12-12 10:27:58 +01:00
Benoit Marty	853518fbb2	Version++	2019-12-11 18:34:06 +01:00
Valere	a673bf092d	Show untrusted conclusions	2019-12-11 18:19:32 +01:00
Valere	0776a301ea	Incoming DM verification handling in timeline	2019-12-11 16:49:34 +01:00
Valere	02f03e6b23	Fix test compilation	2019-12-11 16:00:53 +01:00
Valere	8305ce67dd	Aggregate Event References for DM verifications	2019-12-11 14:44:31 +01:00
Valere	95deeb1be7	Merge pull request #730 from vector-im/feature/sdk_dm_verification ... [SDK] MSC2241 / verification in DMs	2019-12-11 11:10:46 +01:00
Valere	73f0132d5d	FIx / room transport was not updating state	2019-12-10 16:37:54 +01:00
Benoit Marty	5915cebd6d	Merge branch 'release/0.10.0' into develop	2019-12-10 15:47:35 +01:00
Benoit Marty	d91ff87fb9	Prepare release 0.10.0	2019-12-10 15:47:26 +01:00
Valere	c462d15bcf	rebase	2019-12-10 14:23:56 +01:00
Valere	3cdd373368	Convert KeyVerificationStart to data class	2019-12-10 11:14:52 +01:00
Valere	e14602d1dc	fix rebase	2019-12-10 11:14:52 +01:00
Valere	2aa9c3ea22	Fix / Use transport to start verification	2019-12-10 11:14:52 +01:00
Valere	bbd9738452	Simple strategy to Ignore old verification messages	2019-12-10 11:14:52 +01:00
Valere	36c5566b07	cleaning	2019-12-10 11:14:52 +01:00
Benoit Marty	ce63332a2f	Code review	2019-12-10 11:14:52 +01:00
Valere	26b4b6e194	Support verification using room transport	2019-12-10 11:14:20 +01:00
Benoit Marty	79ef055bfb	Merge pull request #746 from vector-im/feature/fix_various_issues ... Fix 2 crashes reported by the PlayStore	2019-12-10 02:14:23 +01:00
Benoit Marty	3a761be6b4	Last cleanup	2019-12-10 01:28:07 +01:00
Benoit Marty	a9e2c31c32	Remove log for privacy	2019-12-10 01:08:05 +01:00
Benoit Marty	3ac53d20e9	Bugfix: react several times with the same reaction was possible (was a TODO).	2019-12-10 01:05:20 +01:00
Benoit Marty	3c18fd5335	Improve EmojiChooserFragment: improve filtering result: sort	2019-12-10 00:42:24 +01:00
Benoit Marty	f00f34b244	Improve EmojiChooserFragment: DI	2019-12-09 23:56:53 +01:00
Benoit Marty	63e0b15f3d	Split EmojiDataSource - cleanup	2019-12-09 23:08:50 +01:00
Benoit Marty	80306f20df	Split EmojiDataSource - avoid !!	2019-12-09 22:57:23 +01:00
Benoit Marty	2972177541	Split EmojiDataSource - cleanup	2019-12-09 22:46:39 +01:00
Benoit Marty	1ad8f47dc1	Split EmojiDataSource	2019-12-09 22:36:38 +01:00