2596 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Valere	03c5e61b2e	Fix / post merge	2020-01-30 16:35:06 +01:00
Valere	4ddd831d7f	Prepare support for toDevice .request	2020-01-30 16:11:34 +01:00
Valere	ff95392e10	Fix / Refresh trust state on own keys/device trust change	2020-01-30 16:10:59 +01:00
Benoit Marty	e2c2c2418c	Merge pull request #919 from vector-im/qr_step_validate ... Qr step validate	2020-01-30 14:14:16 +01:00
Benoit Marty	fbd0bbc575	Improve clarity of the algorithm to enable encryption for DMs	2020-01-30 11:24:05 +01:00
Benoit Marty	2bccd19f84	QRcode: Url encode the keys	2020-01-30 10:17:04 +01:00
Benoit Marty	2111daea52	Add a step to confirm that other user has scanned the SR code	2020-01-30 10:09:59 +01:00
Benoit Marty	c4649a5824	Merge pull request #916 from vector-im/debug_qr ... Negotiate E2E by default for DMs (#907)	2020-01-29 18:02:43 +01:00
Benoit Marty	6f6c3184dd	Avoid test if previous result is null	2020-01-29 17:13:41 +01:00
Benoit Marty	e6c3f7c77b	Nicer API	2020-01-29 16:26:19 +01:00
Benoit Marty	8b6ffc2fb1	ktlint	2020-01-29 16:18:33 +01:00
Benoit Marty	ae36846aaf	Negotiate E2E by default for DMs (#907)	2020-01-29 16:11:23 +01:00
Benoit Marty	237da5bb16	No need to have mutable list in param	2020-01-29 16:03:28 +01:00
Benoit Marty	a4abe5f552	Set timeout to 60s when creating a room	2020-01-29 16:00:07 +01:00
Benoit Marty	e1ddde5501	Make CreateRoomParams a regular data class	2020-01-29 14:23:32 +01:00
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
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
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	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
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