12 commits

Author	SHA1	Message	Date
Travis Ralston	b4e2daaf46	Convert cross-signing feature flag to setting ... This is intended as a temporary measure until we're comfortable with removing the flag entirely.	2020-04-15 13:18:42 -06:00
Bruno Windels	24fe125cb6	dont try to enable 4S if cross-signing is disabled	2020-04-14 17:53:33 +02:00
Bruno Windels	6dc7bf4bdf	fix legacy verify user	2020-04-01 11:22:22 +02:00
Bruno Windels	abf12a3ddf	Show EncryptionPanel straight away when there is an ongoing verification request for a user	2020-03-26 17:31:31 +01:00
Bruno Windels	39bd1da1d0	update copy	2020-03-20 15:43:05 +01:00
Bruno Windels	b97b887305	fix lint	2020-03-20 15:36:58 +01:00
Bruno Windels	073c2c525f	Add "legacy verify" button to untrusted session dialog	2020-03-20 15:36:58 +01:00
Bruno Windels	e373dbd616	use new legacy verif method for a single device	2020-03-11 15:52:48 +01:00
Bruno Windels	13a4f4190f	Revert "also enable 4s when accepting a verification request" ... This reverts commit ab2e3a3465.	2020-03-11 10:11:54 +01:00
Bruno Windels	1eb5bdf847	use USK as we'll only have that around when using key sharing	2020-03-10 18:40:24 +01:00
Bruno Windels	ab2e3a3465	also enable 4s when accepting a verification request	2020-03-10 16:54:49 +01:00
Bruno Windels	ddbfe4e1fa	enable 4S if needed when trying to verify	2020-03-10 16:31:40 +01:00