2742 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
Ganard	e5e62dc4a7	Fix SyncService and Alarm	2020-01-28 10:13:19 +01:00
Benoit Marty	f3e88c75cf	Fix typo	2020-01-28 09:42:56 +01:00
Valere	ea6e8a6789	Basic debug screen to setup keys	2020-01-27 23:51:08 +01:00
Valere	6cece03998	Profile detailed device info + verify manually	2020-01-27 17:55:00 +01:00
Ganard	f3db43f317	Ellipsize: introduce EllipsizingTextView	2020-01-27 12:41:43 +01:00
Valere	08ae0b485a	Profile Screen / Add show device list trust screen	2020-01-27 09:25:58 +01:00
Valere	665c577747	SDK / update trust on key change + live method in Service	2020-01-27 09:25:16 +01:00
ganfra	3a89a30056	Continue reworking sync/timeline events handling	2020-01-25 18:59:45 +01:00
Valere	d60351bcb7	Verify from RoomMember Profile	2020-01-24 19:15:23 +01:00
Ganard	1d8b81bb04	Try reworking events/timeline process [WIP]	2020-01-24 18:43:35 +01:00
Valere	a758efc018	Renamed room transport classes	2020-01-24 11:32:24 +01:00
Valere	d0addc4c4f	Refactored Verification Classes	2020-01-24 11:29:26 +01:00
Valere	bb5179140c	Update profile screen for xSigning	2020-01-24 09:14:32 +01:00
Benoit Marty	e9ea69f055	Add support for /rainbow and /rainbowme command (#879)	2020-01-23 23:34:21 +01:00
ganfra	7bcae75314	Remove some code from main thread	2020-01-23 20:31:18 +01:00
ganfra	4331d2ef47	Network: reword the strategy for handling NetworkConnectivity (remove Merlin)	2020-01-23 19:08:55 +01:00
Valere	e47791f290	Merge pull request #888 from vector-im/qr_code ... Qr code	2020-01-23 16:41:23 +01:00
Valere	91ae96a153	QuickFix / Do not verify yourself in dm	2020-01-23 16:16:57 +01:00
Valere	0148949a4f	Fix / prevent verification toaster to show when in good room	2020-01-23 16:13:46 +01:00