1649 commits

Author	SHA1	Message	Date
Benoit Marty	4504308f25	Less "!!"	2020-03-06 13:34:12 +01:00
onurays	05683967c0	Code review fixes.	2020-03-06 12:07:38 +01:00
Benoit Marty	23c20acff1	Remove TODO	2020-03-06 10:11:30 +01:00
Benoit Marty	be5e6eaa93	Rename parameter type for code clarity	2020-03-06 10:10:16 +01:00
Benoit Marty	2d456d93a7	Common code step 2	2020-03-05 18:16:05 +01:00
Benoit Marty	de36a28541	Common code step 1	2020-03-05 18:00:35 +01:00
Benoit Marty	4634b963a2	Code cleanup	2020-03-05 17:55:13 +01:00
Benoit Marty	b3f887ca28	Code quality	2020-03-05 17:30:34 +01:00
Benoit Marty	3425dd0a63	Make the tests compile and pass	2020-03-05 17:28:35 +01:00
Benoit Marty	2a774833ec	More optimization	2020-03-05 17:11:52 +01:00
Benoit Marty	bda4bbb59c	More optimization	2020-03-05 16:45:49 +01:00
Benoit Marty	0828f9270e	Create asValidObject method - make it works	2020-03-05 16:23:56 +01:00
Benoit Marty	e326631752	Create asValidObject method - make it compiles #2	2020-03-05 15:39:01 +01:00
Benoit Marty	a3f8a53a52	Create asValidObject method - make it compiles.	2020-03-05 15:29:44 +01:00
Benoit Marty	7b5a50ec6e	Create asValidObject method - not compiling	2020-03-05 12:06:19 +01:00
Benoit Marty	36c52d24a7	Move method to interface step 3	2020-03-05 11:24:35 +01:00
Benoit Marty	1b29c7bf91	Move method to interface step 2	2020-03-05 11:22:42 +01:00
Benoit Marty	b6aee04e24	Move method to interface step 1	2020-03-05 11:21:44 +01:00
onurays	03d2cd0639	Lint fix.	2020-03-04 17:57:57 +01:00
onurays	b7ad50a3ce	Make mimeType private to encourage using getSafeMimeType() method.	2020-03-04 16:52:52 +01:00
onurays	9cbaadedfb	Unused context parameter is removed.	2020-03-04 16:52:08 +01:00
onurays	d4384328fe	Use "image/jpeg" instead of "image/jpg"	2020-03-04 16:26:09 +01:00
Benoit Marty	5fd8425289	Remove unused files	2020-03-04 16:09:37 +01:00
onurays	26d387cc12	Support sharing other media types.	2020-03-04 13:47:48 +01:00
onurays	319667096f	Return Try.Failure instead of throwing exception.	2020-03-03 13:41:40 +01:00
onurays	5f14516dec	Share images from clear and encrypted rooms.	2020-03-03 10:39:24 +01:00
Benoit Marty	c13b636bae	Code cleanup	2020-02-29 10:05:48 +01:00
Benoit Marty	551604cdcb	Add missing push rules	2020-02-28 19:02:13 +01:00
Benoit Marty	8a2bafec5f	Restore push rule settings - fix issues	2020-02-28 18:35:51 +01:00
Benoit Marty	3013e311a4	Restore push rule settings - WIP	2020-02-28 16:51:11 +01:00
Benoit Marty	1c35d07acc	PushRuleService.getPushRules() now returns a RuleSet. Use getAllRules() on this object to get all the rules.	2020-02-28 16:29:58 +01:00
Benoit Marty	039924436f	Json parsing	2020-02-28 14:51:35 +01:00
Valere	779026b0af	Fix / mark master key as trusted after self verif	2020-02-28 11:46:32 +01:00
Benoit Marty	b1b8513da4	Create fromBase64Safe() to parse data received from external source	2020-02-27 19:17:14 +01:00
Benoit Marty	0a9008a73d	Be robust if other client sends padded base64 in the reciprocate	2020-02-27 18:35:05 +01:00
Benoit Marty	1ead2778c2	... and rename the method fromBase64NoPadding() to fromBase64()	2020-02-27 18:33:57 +01:00
Benoit Marty	8299487f6d	Avoid using encoder flag to decode Base64 string...	2020-02-27 18:13:42 +01:00
Benoit Marty	ceab0903cf	Improve code - TU passed	2020-02-27 18:09:37 +01:00
Benoit Marty	a296234163	Fix crash after rework. RoomKeyShare is now an interface	2020-02-26 20:35:34 +01:00
Benoit Marty	6349f9828d	Optimize import	2020-02-26 16:59:20 +01:00
Benoit Marty	989d396c78	Rename package "sas" to "verification"	2020-02-26 16:52:16 +01:00
Benoit Marty	4ba8a42977	Fix crash reported from rageshake	2020-02-26 15:32:52 +01:00
Benoit Marty	4280bc0780	Fix crash reported from rageshake	2020-02-26 14:10:51 +01:00
Benoit Marty	6622e0daca	Code quality	2020-02-26 12:43:41 +01:00
Valere	9d1718cda8	post merge clean	2020-02-26 12:20:03 +01:00
Valere	f7c128be3d	Fix tests	2020-02-26 12:20:03 +01:00
Valere	b4a783198b	code review	2020-02-26 12:20:03 +01:00
Valere	0cfc9451ca	Cleaning	2020-02-26 12:20:03 +01:00
Valere	4b75baf772	Fix / trust was not properly updated after 4S restore	2020-02-26 12:20:03 +01:00
Valere	c579de1033	Fix / Test crash when crypto DB closed ... Quick Work around	2020-02-26 12:20:03 +01:00
Valere	d537abc522	Fix / sign current device after entering xsigning passphrase	2020-02-26 12:20:03 +01:00
Valere	030f027516	Fixes #1051 ... XSigning | Self verification Empty bottomsheet	2020-02-26 12:20:03 +01:00
Valere	cbd7c1aa63	Fix / Bad ordering of active sessions	2020-02-26 12:20:03 +01:00
Valere	bdb1df75d4	Check trust on crypto thread	2020-02-26 12:20:03 +01:00
Valere	817dc19b9a	Cleaning	2020-02-26 12:20:03 +01:00
Valere	f9be4fa2bd	Fixes #1047	2020-02-26 12:20:03 +01:00
Valere	94d36e0c85	cleaning jni	2020-02-26 12:20:03 +01:00
Valere	0064934db9	Changed Encryption algorithm of 4S	2020-02-26 12:20:03 +01:00
Valere	e2e4ddf5ba	Post rebase fix	2020-02-26 12:20:03 +01:00
Valere	9a08f5ec4e	WIP / Verify from passphrase UX	2020-02-26 12:19:31 +01:00
Valere	3dc89c8d87	Update Self Verification BottomSheet for quads	2020-02-26 12:15:59 +01:00
ganfra	bddeb6cb72	Clean files	2020-02-26 11:50:41 +01:00
ganfra	d57f6838e9	Remove decryption from room summary mapper and make TimelineEventDecryptor scoped to session	2020-02-26 11:50:41 +01:00
ganfra	cf8ffa3a7a	Force trust task on crypto dispatcher to use cached realm from crypto store	2020-02-26 11:49:08 +01:00
Benoit Marty	40b4db4a64	Merge pull request #1060 from vector-im/feature/data_class_cleanup ... Data class cleanup	2020-02-26 10:57:10 +01:00
Benoit Marty	67180fd8db	New direct chat: selecting several participants was not adding the room to the direct chats list	2020-02-26 07:38:10 +01:00
Benoit Marty	fc95bf4926	Improve CreateRoomParams API: update some API for better chaining of builder like methods (#1070)	2020-02-26 07:32:22 +01:00
Benoit Marty	e73f138151	Improve CreateRoomParams API: update Javadoc and ensure the return values will not be discarded (#1070)	2020-02-26 07:17:25 +01:00
Benoit Marty	b95dfa4473	Create getBestName method for User	2020-02-25 18:14:02 +01:00
Benoit Marty	17e028178e	Code robustness (avoid using !!)	2020-02-25 11:20:11 +01:00
ganfra	19b9617a09	Invite: fix inviterId being overrided	2020-02-25 10:53:47 +01:00
Benoit Marty	b9b921a4df	Code quality	2020-02-25 09:53:17 +01:00
ganfra	483256093a	Invite: fix room member not saved	2020-02-24 18:27:18 +01:00
Benoit Marty	9c566b19f7	Ensure all eventId start with $, even ids for local echo	2020-02-24 17:35:43 +01:00
ganfra	8b0305c91d	Clean code	2020-02-24 17:33:40 +01:00
ganfra	981c9ac4ac	Invite sync: assign eventId and remove the primaryKey constraint	2020-02-24 17:33:40 +01:00
Benoit Marty	c6b3b1e648	Fix bug on test	2020-02-24 17:27:04 +01:00
Benoit Marty	96af1957f9	Fix bug on progress step, found by integration test testBackupWithPassword()	2020-02-24 16:27:58 +01:00
Benoit Marty	b680e24938	Fix some tests	2020-02-24 16:16:37 +01:00
Benoit Marty	b3c8b5526d	Each session now have it's proper crypto store	2020-02-24 15:03:12 +01:00
Benoit Marty	1e44e77503	Make code robust to int received instead of boolean ... https://github.com/matrix-org/synapse/issues/6977	2020-02-24 14:42:47 +01:00
Benoit Marty	b03b6bfc37	Fix crash discovered thanks to integration tests	2020-02-24 12:53:18 +01:00
Benoit Marty	1a6d4d0b03	Try to fix XSigningTest	2020-02-21 19:20:40 +01:00
Benoit Marty	1b763fb4c8	Cleanup XSigningTest	2020-02-21 18:52:36 +01:00
Benoit Marty	9ef267cb07	Cleanup after each test	2020-02-21 18:36:13 +01:00
Benoit Marty	d167ff9496	Make KeysBackup test pass (still work to do)	2020-02-21 17:58:04 +01:00
Benoit Marty	ccfa59ad31	Cleanup var -> val	2020-02-21 15:05:48 +01:00
Benoit Marty	d6434654e2	Merge pull request #1043 from vector-im/feature/join_federation ... Fix join room over federation	2020-02-21 10:08:05 +01:00
Benoit Marty	b6372df676	Merge pull request #1037 from vector-im/feature/crosssigning_qr ... Migrate to binary QR code verification (#994)	2020-02-21 10:01:49 +01:00
Benoit Marty	d7de072155	typo	2020-02-21 09:58:56 +01:00
Benoit Marty	a9909b37ba	Update after Valere's review	2020-02-20 19:54:35 +01:00
Benoit Marty	b72698d63c	Fix another issue when there is no name and no canonical alias on a public room	2020-02-20 18:47:07 +01:00
Benoit Marty	eec65fb622	Join room by roomId or room alias	2020-02-20 18:17:57 +01:00
Benoit Marty	87021dd6ec	Rename field	2020-02-20 18:16:10 +01:00
Benoit Marty	b85c76b172	Simplify code	2020-02-20 18:05:53 +01:00
Benoit Marty	d867b1345f	Format	2020-02-20 15:15:38 +01:00
onurays	7d232527c8	Documentation of the API change is added.	2020-02-20 16:39:48 +03:00
Benoit Marty	e61d563589	Split long lines	2020-02-20 10:16:09 +01:00
Benoit Marty	74175ddfa0	Add a test and create extension for Byte to avoid using UByte (still experimental)	2020-02-20 10:12:07 +01:00
Benoit Marty	382fc6f05c	Fix issue with long transactionId	2020-02-19 18:59:39 +01:00
Benoit Marty	e81439d57b	Remove v2 suffix	2020-02-19 18:09:33 +01:00
Benoit Marty	f81eb298cb	Cleanup QRCode v1	2020-02-19 18:06:51 +01:00
Benoit Marty	859b9e4f8e	Migrate to QrCode v2 - TODO: cleanup	2020-02-19 17:50:30 +01:00
Benoit Marty	e00d3ef63d	QrCodeV2 WIP (al tests passing)	2020-02-19 17:34:07 +01:00
onurays	a97971dd84	Fix threading issues while restoring keys backup.	2020-02-19 18:30:12 +03:00
Benoit Marty	66a2958c39	Add unit test to check byte array to string conversion	2020-02-19 14:21:41 +01:00
Benoit Marty	c6b231c0b1	Create toState() fun and use the enum	2020-02-18 14:12:50 +01:00
Benoit Marty	53410789c0	Cleanup	2020-02-18 14:12:50 +01:00
Benoit Marty	7133d513b4	Fix crash in the room directory, when public room has no name (#1023)	2020-02-18 10:45:14 +01:00
Benoit Marty	ebda12dd76	Merge branch 'develop' into feature/attachment_process	2020-02-17 19:22:50 +01:00
Benoit Marty	adc545a93d	Merge pull request #1026 from vector-im/feature/crypto_service_renaming ... Feature/crypto service renaming	2020-02-17 19:21:02 +01:00
Benoit Marty	67ed86fee5	Rename KeysBackup to DefaultKeysBackupService	2020-02-17 18:51:06 +01:00
Benoit Marty	141c7d6af0	Update comment	2020-02-17 18:43:04 +01:00
Benoit Marty	f2f94c4a93	Reduce code duplication	2020-02-17 17:56:11 +01:00
Benoit Marty	4995c14f69	Add log	2020-02-17 17:46:15 +01:00
ganfra	91cbcebf73	Make test compile	2020-02-17 15:50:42 +01:00
ganfra	fd0dceb597	Clean code	2020-02-17 15:23:24 +01:00
Benoit Marty	13d3aa9ff1	Merge branch 'develop' into feature/attachment_process	2020-02-17 13:48:21 +01:00
ganfra	e349a35419	Crypto: expose cryptoService by a getter, removing the session implementation delegation	2020-02-16 15:40:31 +01:00
Benoit Marty	a61f508b5d	Fix a nice bug	2020-02-14 22:00:36 +01:00
Benoit Marty	76085a4284	AccountData cleanup and Javadoc	2020-02-14 21:50:37 +01:00
Benoit Marty	446d826dd3	Create tag interface AccountDataContent	2020-02-14 20:53:45 +01:00
Benoit Marty	2d6f57e214	More cleanup/code lisibility	2020-02-14 20:50:21 +01:00
Ganard	a305ce302e	Coroutine sequencer: use semaphore	2020-02-14 19:37:51 +01:00
Benoit Marty	7ddea99fc6	Move and improve withOlmDecryption() and withOlmEncryption()	2020-02-14 18:51:27 +01:00
Benoit Marty	4c3b754de4	Use const from DefaultSharedSecretStorageService	2020-02-14 18:33:15 +01:00
Benoit Marty	7878da25b8	Use doSync<>() to reduce boilerplate and add test checks ... and more cleanup	2020-02-14 18:18:20 +01:00
Benoit Marty	01597a89dc	Avoid code duplication	2020-02-14 17:53:27 +01:00
Benoit Marty	db19ab0531	Merge branch 'develop' into feature/4s_msc1946	2020-02-14 17:45:44 +01:00
Benoit Marty	cad818c341	ktlint	2020-02-14 17:05:14 +01:00
Benoit Marty	88b8ceaeb5	Merge pull request #1005 from vector-im/feature/fix_event_redaction_prompt ... Do not ask for a reason if user wants to delete his own message.	2020-02-14 14:36:01 +01:00
onurays	030d6824e3	Code review fixes.	2020-02-14 15:04:25 +03:00
Valere	35835be03e	klint	2020-02-14 12:06:07 +01:00
Valere	f99eca8014	Code review	2020-02-14 10:48:18 +01:00
Valere	e0eede1150	cleaning	2020-02-14 10:48:18 +01:00
Valere	64647cb465	Fix / Save account data after update (local echo)	2020-02-14 10:48:18 +01:00
Valere	def01cca8f	Fix test + changes	2020-02-14 10:48:18 +01:00
Valere	108ebea84e	SSSS service + test	2020-02-14 10:48:18 +01:00
Valere	bf06b57bad	Refactor Account Data ... Auto stash before rebase of "develop"	2020-02-14 10:48:18 +01:00
Valere	a250a895fe	Remove redudant calls to eventBus post	2020-02-14 10:47:34 +01:00
Benoit Marty	6c0bddc893	Code quality	2020-02-13 23:20:35 +01:00
Benoit Marty	b66b96899e	Better Kotlin code	2020-02-13 22:56:11 +01:00
Benoit Marty	e6bd09859f	Compress image before sending	2020-02-13 22:50:55 +01:00
Benoit Marty	06ba478232	Send files to several rooms at a time	2020-02-13 20:10:59 +01:00
Benoit Marty	81de914360	Propose to edit media before sending, when coming form another application	2020-02-13 20:10:59 +01:00
Ganard	b7a7aa2f15	Attachment: continue working on preview screen	2020-02-13 19:52:11 +01:00
Benoit Marty	d21604b791	Merge pull request #989 from vector-im/feature/qr_code_mistake ... Fix issue with verification when other client declares it can only show QR code (#988)	2020-02-13 19:41:10 +01:00
Valere	1941862499	Fix / Remove debug code line	2020-02-13 15:50:08 +01:00
Benoit Marty	f2e6900cfb	Move throw line	2020-02-13 07:44:54 +01:00
Benoit Marty	0b7e757f3c	Code lisibility: use generic name for parameters in Dagger modules	2020-02-13 07:12:11 +01:00
Benoit Marty	5b2c947af1	Rename internal class	2020-02-13 07:05:46 +01:00
Benoit Marty	6a69c6356d	PushersService.pushers() has been renamed to PushersService.getPushers()	2020-02-13 07:04:54 +01:00
Benoit Marty	e492e4318b	Do some parameter checks	2020-02-13 06:48:52 +01:00
Benoit Marty	93d38843c3	Add Javadoc	2020-02-13 06:36:21 +01:00
Valere	21bac0f867	Fix / typo in poll	2020-02-12 22:31:13 +01:00
Valere	32c4ad9ecb	Use vendor prefix for non merged MSC	2020-02-12 19:09:23 +01:00
Valere	e91c6c216d	code quality	2020-02-12 17:03:21 +01:00
Benoit Marty	47f47e40c4	code review and cleanup	2020-02-12 15:09:38 +01:00
Benoit Marty	9016688aec	Fix compilation issue after rebase	2020-02-12 13:48:08 +01:00
Valere	d5f8a0c0fc	code quality	2020-02-12 13:40:54 +01:00
Valere	9a7bd35ddc	Add m.buttons support (a.k.a bot buttons)	2020-02-12 13:40:54 +01:00
Valere	c4ea2507f8	Add command to send poll	2020-02-12 13:39:30 +01:00
Valere	6001ac60ab	klint cleaning	2020-02-12 13:37:16 +01:00
Valere	3dae220501	Fix / filter edits and poll response form lastPreviewableMessage	2020-02-12 13:37:16 +01:00
Valere	577c5a16b3	Support incremental poll response aggregation + display	2020-02-12 12:47:28 +01:00
Valere	a0aebed3f7	Message Poll UX, and model	2020-02-12 12:42:17 +01:00
Benoit Marty	3a044bd655	Add Javadoc	2020-02-12 11:39:36 +01:00
Benoit Marty	6acfab3242	Rename VerificationListener to Listener	2020-02-12 11:39:36 +01:00
Benoit Marty	bf02746d87	Clenaup VerificationService.VerificationListener	2020-02-12 11:39:36 +01:00
Benoit Marty	377d944228	Cleanup API	2020-02-12 11:39:36 +01:00
Benoit Marty	6ff974b3ea	Fix issue with verification when other client declares it can only show QR code (#988)	2020-02-12 11:39:36 +01:00
Benoit Marty	2e7fa23ce7	Fix #980	2020-02-10 19:13:35 +01:00
Benoit Marty	dd13b6bd99	Add test for DisplayName condition (passing)	2020-02-07 15:44:46 +01:00
Benoit Marty	9df699db59	Reorder tests	2020-02-07 15:35:09 +01:00
Benoit Marty	8bdb2b88fd	make the test compile	2020-02-07 15:32:36 +01:00
Benoit Marty	2a534b5874	Handle SenderNotificationPermissionCondition	2020-02-07 15:32:20 +01:00
Benoit Marty	f719da96ed	Rename Condition.Kind enum values and add some documentation	2020-02-07 15:02:39 +01:00
Benoit Marty	31e5c0eb1a	Improve algorithm	2020-02-07 14:48:08 +01:00
Benoit Marty	34c5f37bbc	findAll() does not return null value	2020-02-07 14:30:44 +01:00
Benoit Marty	9aadbbc3c7	Rework DefaultConditionResolver, and create RoomGetter	2020-02-07 14:27:24 +01:00
Benoit Marty	5fedfd9286	Cleanup	2020-02-06 16:00:05 +01:00
Valere	1917fbcc93	eventBus private	2020-02-06 13:56:57 +01:00
Valere	a48bf61ad7	quick dispatch to correct thread (will need more work)	2020-02-06 13:56:57 +01:00
Valere	5c1fcc47a1	Catch all decryption fails in mapping	2020-02-06 13:56:57 +01:00
Valere	d80c15f52f	Dispatch init on crypto thread to avoid blocking cold start	2020-02-06 13:56:57 +01:00
Valere	911ff8cf16	cleaning (klint)	2020-02-06 13:56:57 +01:00
Valere	320dc4accd	Refactor Room Shield / Profile shield	2020-02-06 13:56:57 +01:00
Benoit Marty	51c2b9e1e9	Import strings from Riot	2020-02-05 17:35:23 +01:00
Benoit Marty	dcd7d17ffd	Fix compilation issue after merge and update CHANGES.md	2020-02-05 14:13:43 +01:00
Benoit Marty	d9c007d017	Merge branch 'develop' into feature/stabilization_2	2020-02-05 12:57:42 +01:00
Benoit Marty	05dd587fa8	Move FORMAT_MATRIX_HTML to a proper object and so fix a wrong usage issue	2020-02-05 12:44:31 +01:00
Benoit Marty	3384d91adb	Rename MessageContent.type to MessageContent.msgType for code clarity and update a few the Javadoc	2020-02-05 12:39:26 +01:00
Benoit Marty	a3ec0e03a0	Use NoOpMatrixCallback when it's possible	2020-02-05 12:05:12 +01:00
Benoit Marty	47ee2a24a7	Move NoOpMatrixCallback to MatrixCallback.kt file	2020-02-05 11:58:08 +01:00
Benoit Marty	a17ec14dd7	Cleanup and little change on Throwable logging	2020-02-05 11:39:23 +01:00
Benoit Marty	f7d511df38	Ganfra's review	2020-02-04 17:48:17 +01:00
Benoit Marty	6bff951c72	Keep MXCryptoConfig, but do a correct usage of it	2020-02-04 15:37:46 +01:00
Benoit Marty	bd033866a8	Encrypt for invited users by default, if the room state allows it (#803)	2020-02-04 14:41:32 +01:00
Benoit Marty	3e9b2e4a06	Use the correct enableEncryption() method	2020-02-04 14:04:48 +01:00
Ganard	ed9c3379bf	Rename file	2020-02-04 13:50:10 +01:00
Ganard	1728d31401	Fix some issues and make test passes	2020-02-04 13:19:02 +01:00
Benoit Marty	225a6e00e6	Add doc and reorder	2020-02-04 12:10:51 +01:00
Benoit Marty	4335fa4f72	ktlint	2020-02-03 16:26:18 +01:00
Ganard	f454078c6b	Clean code	2020-02-03 16:14:36 +01:00
Ganard	88755a79b4	In memory sending: fix broken filtering	2020-02-03 15:18:19 +01:00
Ganard	e6cd8a3a86	Merge develop into feature/stabilization_2	2020-02-03 13:59:20 +01:00
Valere	b182a63ea1	fix concurrent co mofification	2020-02-02 15:28:00 +01:00
Valere	367057cc29	Fix / cold start	2020-02-02 14:01:45 +01:00
Valere	96a556f449	Fix / Race causing key requests to be sent to early in xsigning	2020-02-02 01:21:08 +01:00
Valere	fb838e5407	Fixes #813	2020-02-01 23:24:05 +01:00
Valere	245b3717b9	Send done in toDevice	2020-02-01 18:25:31 +01:00
Benoit Marty	cd606ba8a1	RoomMember decoration	2020-02-01 11:37:16 +01:00
Valere	fc4f5faffd	Update Room decoration algo	2020-02-01 10:21:29 +01:00
Benoit Marty	f2f775cb99	Add TODOs	2020-02-01 01:17:18 +01:00
Benoit Marty	ccd4c1ed86	ktlint	2020-01-31 20:46:33 +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
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
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	80f4f95f81	QRCode: requestId is not supposed to be an eventId	2020-01-31 11:11:27 +01:00
Valere	4fb59aadb1	Fix / ensure RoomKeyRequest are made after device is verified	2020-01-31 09:39:31 +01:00
Benoit Marty	9dde43f65b	PR Review: var -> val, internal and other cleanup	2020-01-30 23:40:25 +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	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	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	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	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	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
ganfra	7f72af426b	Timeline: fix getContext	2020-01-29 16:02:53 +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