2811 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Valere	754ca3c582	Fix / fail to update usk when dl own keys	2020-01-29 14:00:02 +01:00
Benoit Marty	70b04dbaea	Disable not passing test, to avoid waiting too long when running the test suite	2020-01-29 12:36:38 +01:00
Benoit Marty	b44b6726ed	Also update the tests	2020-01-29 12:29:19 +01:00
Benoit Marty	80ec199135	Convert VerificationTxState to a sealed class	2020-01-29 12:00:49 +01:00
Benoit Marty	305dfd4c7a	Merge pull request #911 from vector-im/feature/encryption_notice ... Modify encryption notice	2020-01-29 10:32:23 +01:00
Benoit Marty	73bb4bb785	Merge pull request #912 from vector-im/feature/e2e_opt_out ... e2e opt in when creating room (not DM)	2020-01-29 10:29:33 +01:00
Valere	1d84ccd64a	Merge pull request #881 from vector-im/xsigning_sdk ... Xsigning sdk	2020-01-29 10:26:46 +01:00
Valere	63e36b0403	Remove unused test	2020-01-29 10:16:57 +01:00
Valere	2c568b4de9	clean klint	2020-01-29 09:59:09 +01:00
Benoit Marty	27fe4e3680	Fix build and add tests	2020-01-29 09:44:53 +01:00
Benoit Marty	007b0cabf2	Add a few TUs	2020-01-28 22:43:10 +01:00
Benoit Marty	b2338dfcd3	Make the TU passes	2020-01-28 22:35:40 +01:00
Benoit Marty	6d7d4993a6	Add TUs for RainbowGenerator (not all passing)	2020-01-28 21:56:02 +01:00
Benoit Marty	da9b9f4864	Make the whole cell clickable	2020-01-28 21:31:02 +01:00
Benoit Marty	ef0b438a89	Give the possibility to enable encryption when creating room (#837)	2020-01-28 21:31:02 +01:00
Ganard	a8f783bbfa	Add state events to chunks	2020-01-28 18:59:21 +01:00
Valere	9a79297e14	Merge pull request #910 from vector-im/qr_code_step_2 ... Qr code step 2	2020-01-28 18:11:09 +01:00
Valere	a57393cafa	More log + quick fix in settings	2020-01-28 18:09:17 +01:00
Benoit Marty	e12de3fba0	Merge pull request #891 from vector-im/feature/event-unknown ... Feature/event unknown	2020-01-28 17:30:02 +01:00
Benoit Marty	2eeeea3377	Encryption is enabled only for MEGOLM.	2020-01-28 17:19:22 +01:00
Benoit Marty	976a8fc568	Hide the algorithm when turning on e2e (#897)	2020-01-28 16:36:28 +01:00
Benoit Marty	b7ecfd997d	Fix compilation issue after rebase	2020-01-28 16:02:20 +01:00
Benoit Marty	e0b3ea7e48	QrCode: WIP	2020-01-28 15:55:44 +01:00
Benoit Marty	9c829e62e6	QrCode: WIP	2020-01-28 15:55:44 +01:00
Benoit Marty	20c7e4c3ad	QrCode: improve UI	2020-01-28 15:55:44 +01:00
Benoit Marty	69ab5e43d5	QrCode: WIP	2020-01-28 15:55:02 +01:00
Benoit Marty	f46023e84c	QrCode: WIP	2020-01-28 15:55:02 +01:00
Benoit Marty	d8d465f70b	QrCode: WIP	2020-01-28 15:53:57 +01:00
Benoit Marty	8659216955	QrCode: WIP	2020-01-28 15:53:57 +01:00
Benoit Marty	39e746413a	QrCode: WIP	2020-01-28 15:53:57 +01:00
Benoit Marty	0aaba26f17	Rename classes	2020-01-28 15:53:57 +01:00
Benoit Marty	fc04833157	Rename parameter	2020-01-28 15:53:57 +01:00
Benoit Marty	f80861bed8	Add TODO	2020-01-28 15:53:57 +01:00
Benoit Marty	9e796067cc	Do not support SHOW or SCAN if cross-signing is not enabled	2020-01-28 15:53:57 +01:00
Benoit Marty	fb5148fd43	Avoid to inject credential (again)	2020-01-28 15:52:17 +01:00
Benoit Marty	be77017209	Avoid injecting credentials. Inject userId and deviceId instead ... And cleanup API	2020-01-28 15:48:09 +01:00
Benoit Marty	962b85b041	Add TODO	2020-01-28 15:48:09 +01:00
Benoit Marty	adc2d570eb	QR code: handle the case where other user can scan QR codes	2020-01-28 15:48:09 +01:00
Benoit Marty	df49ab8362	QR code: update code which build URL	2020-01-28 15:48:09 +01:00
Benoit Marty	efc8cfb9a1	QR code: modify APIs	2020-01-28 15:48:09 +01:00
Benoit Marty	345824daa2	Keep on renaming	2020-01-28 15:48:09 +01:00
Benoit Marty	050eb0af9d	Create dedicated View and Epoxy item for QrCode	2020-01-28 15:48:09 +01:00
Valere	ca4ed6e1bd	Fix / Error management and clear keys	2020-01-28 15:35:11 +01:00
Ganard	bf7c53ecab	Sync/pagination: get a working version	2020-01-28 14:46:26 +01:00
Valere	f021f8110d	post merge	2020-01-28 12:04:19 +01:00
Valere	109ff4f908	Merge branch 'cross_signing' into xsigning_sdk	2020-01-28 11:33:54 +01:00
Valere	c9f0209ebf	post merge fix	2020-01-28 11:23:37 +01:00
Valere	7daa088618	Merge branch 'develop' into cross_signing	2020-01-28 11:13:31 +01:00
Valere	83e44ac96e	Fix / cross signing info live data not always updated	2020-01-28 11:02:12 +01:00
Ganard	15b0bea870	Use clone for retrofit request to be able to retry	2020-01-28 10:13:36 +01:00