2768 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Benoit Marty	2616a889ef	Merge pull request #923 from vector-im/feature/xcrossing_fix ... Decoration in room profile and improve Rx flow	2020-01-31 20:48:20 +01:00
Benoit Marty	ccd4c1ed86	ktlint	2020-01-31 20:46:33 +01:00
Benoit Marty	bb92882958	(partially) Fix glitch	2020-01-31 20:28:57 +01:00
Benoit Marty	46dd17644f	Room decoration - in room profile UI	2020-01-31 20:12:02 +01:00
Benoit Marty	7e34b2a672	Room decoration - convert to ConstraintLayout	2020-01-31 20:02:01 +01:00
Benoit Marty	c3c88c387b	Improve Rx chain and cleanup	2020-01-31 19:55:22 +01:00
Valere	51e0f945a7	Quick Room Decoration	2020-01-31 18:52:33 +01:00
Ganard	37230b0614	Fix issues with read marker and jumpToBottom	2020-01-31 18:09:34 +01:00
Benoit Marty	fd3619b100	Merge pull request #770 from vector-im/cross_signing ... Cross signing	2020-01-31 17:05:18 +01:00
Benoit Marty	e18b9d5155	Room decoration - UI in room list	2020-01-31 16:10:52 +01:00
Ganard	ec6d78bf96	Merge branch 'develop' into feature/stabilization_2	2020-01-31 15:47:33 +01:00
Ganard	759b680e63	Timeline/Sync: Fix some issues	2020-01-31 15:28:35 +01:00
Benoit Marty	f5ecf4bd90	Room decoration - UI	2020-01-31 15:02:54 +01:00
Valere	27c74c9118	live device in settings	2020-01-31 14:42:00 +01:00
Benoit Marty	4d91bc934b	Fix ktlint	2020-01-31 14:12:03 +01:00
Valere	5c547794f2	Merge branch 'develop' into cross_signing	2020-01-31 14:09:40 +01:00
Benoit Marty	43358cd86c	Make self verification work!	2020-01-31 12:18:27 +01:00
Benoit Marty	87b76d10dd	Format	2020-01-31 11:11:27 +01:00
Benoit Marty	80f4f95f81	QRCode: requestId is not supposed to be an eventId	2020-01-31 11:11:27 +01:00
Valere	8e5c7239cf	Settings Sessions / Now live + support devices with no keys	2020-01-31 10:33:53 +01:00
Valere	7b385c3b36	Quick copy change device -> session	2020-01-31 10:00:44 +01:00
Valere	4fb59aadb1	Fix / ensure RoomKeyRequest are made after device is verified	2020-01-31 09:39:31 +01:00
Valere	850c830e1f	Fix / auto ready request when waiting bottomsheet on screen	2020-01-31 09:16:03 +01:00
Benoit Marty	9dde43f65b	PR Review: var -> val, internal and other cleanup	2020-01-30 23:40:25 +01:00
Benoit Marty	9d566e9352	Merge pull request #918 from vector-im/feature/sort_room_members ... Sort room members by display names	2020-01-30 21:06:40 +01:00
Benoit Marty	eb46a4949f	Merge pull request #920 from duncanturk/patch-1 ... Add "get it on F-Droid"	2020-01-30 21:05:53 +01:00
Benoit Marty	506c2dd262	Merge pull request #921 from vector-im/decorations ... Add field in QR code and make some optional	2020-01-30 18:48:30 +01:00
Benoit Marty	ccd857016c	ktlint	2020-01-30 18:46:08 +01:00
Benoit Marty	225e4e0433	To Device Verification Request	2020-01-30 18:43:50 +01:00
Ganard	5e1b59f9d3	Timeline: handle an in memory local echo to make the UI snappier	2020-01-30 17:13:44 +01:00
Benoit Marty	069bd3c258	use isMe	2020-01-30 16:59:22 +01:00
Benoit Marty	fb98d6ef42	QRCode: add other_device_key field and make it optional, along with other_user_key	2020-01-30 16:46:12 +01:00
Benoit Marty	6282f81bc4	Remove typo	2020-01-30 16:46:12 +01:00
Valere	a5ca2b1d34	Fix / incoming start verif popup should not show when bottomsheet there	2020-01-30 16:36:13 +01:00
Valere	50d5ad3625	Self verification + toDevice Request	2020-01-30 16:35:42 +01:00
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
Christopher Rossbach	e44dc347c6	Add "get it on F-Droid" ... RiotX is on F-Droid now	2020-01-30 12:07:33 +01:00
Benoit Marty	fbd0bbc575	Improve clarity of the algorithm to enable encryption for DMs	2020-01-30 11:24:05 +01:00
ganfra	b848d0530f	Update realm to 6.1.0: should fix some of the native crashes	2020-01-30 11:04:37 +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
ganfra	9fc3fa7f19	Update some libs and remove incremental from dagger	2020-01-29 21:14:38 +01:00
Benoit Marty	57a13fa30d	Sort room members by display names	2020-01-29 18:07:57 +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
ganfra	71a02a58af	Sync/Timeline: handle displayName isUnique	2020-01-29 17:30:31 +01:00
Benoit Marty	6f6c3184dd	Avoid test if previous result is null	2020-01-29 17:13:41 +01:00
Benoit Marty	d7feb6dd5c	Merge pull request #913 from vector-im/feature/rainbow ... Rainbow	2020-01-29 16:35:34 +01:00