1463 commits

Author	SHA1	Message	Date
Valere	7c1428e097	preserver relations as non encrypted	2020-03-12 10:05:55 +01:00
Valere	32fd4c1be9	save decryption result at encryption	2020-03-11 19:39:40 +01:00
Valere	f53fc205e1	Fix Message transitions in encrypted rooms ... Fixes #518	2020-03-11 18:07:18 +01:00
Valere	49f2064439	Fix / Self verification mode 1 was not working	2020-03-11 11:43:23 +01:00
Valere	a9074cdbbb	Remove dangerous runBlocking (and un-nedded)	2020-03-10 17:25:04 +01:00
Benoit Marty	13036a5933	Pusher: update javadoc	2020-03-06 16:37:13 +01:00
Benoit Marty	35179509f2	Merge pull request #1111 from vector-im/feature/verification_code ... Feature/verification code	2020-03-06 15:02:57 +01:00
Benoit Marty	23862cb3d0	Merge branch 'develop' into feature/notif	2020-03-06 14:43:23 +01:00
Benoit Marty	2b8e2a312b	Avoid use toImmutableList()	2020-03-06 14:39:33 +01:00
Benoit Marty	62fdb4c27a	Use getOrPut()	2020-03-06 14:37:30 +01:00
Benoit Marty	b929a2f185	Merge pull request #1099 from vector-im/feature/fix_share_image ... Share images from clear and encrypted rooms.	2020-03-06 14:27:47 +01:00
Benoit Marty	fb858bc112	Rename to respect naming convention #3	2020-03-06 14:04:02 +01:00
Benoit Marty	5d0e917f04	Rename to respect naming convention #2	2020-03-06 13:50:00 +01:00
Benoit Marty	e420070066	Rename to respect naming convention	2020-03-06 13:40:35 +01:00
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