3518 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Onuray Sahin	a80181da9e	Merge branch 'develop' into feature/misleading_url_target	2020-04-23 20:18:44 +03:00
onurays	72de5d6adc	Code review fixes.	2020-04-23 20:17:52 +03:00
Benoit Marty	ed4154d763	Merge pull request #1261 from vector-im/feature/unwedging ... Feature/unwedging	2020-04-23 18:20:31 +02:00
Benoit Marty	4ee13b6fa1	Merge branch 'develop' into feature/unwedging	2020-04-23 18:20:09 +02:00
Benoit Marty	33fb1dd147	Merge pull request #1262 from vector-im/feature/fix_add_by_user_id ... Add user to direct chat by user id.	2020-04-23 18:05:15 +02:00
Valere	736905edf8	Merge pull request #1269 from vector-im/feature/complete_security_hide_4s ... Hide Use recovery key when 4S is not setup	2020-04-23 18:03:14 +02:00
Benoit Marty	e8a91eab88	Merge pull request #1265 from vector-im/feature/deactivate ... Deactivate account using password	2020-04-23 17:30:08 +02:00
onurays	c3299845c1	use generic cancel and continue strings.	2020-04-23 17:44:30 +03:00
onurays	54644db587	Dialog design fixes.	2020-04-23 17:37:30 +03:00
onurays	ec2ba7c0b2	Do not warn if the domain of urls are the same and colorize links.	2020-04-23 16:30:37 +03:00
onurays	06a13d5c20	Show a warning dialog if the text of the clicked link does not match the link target ... Fixes #922	2020-04-23 15:42:57 +03:00
Valere	7e0591ffee	Hide Use recovery key when 4S is not setup	2020-04-23 11:14:20 +02:00
Benoit Marty	1363100f94	Create DM: now any userId can be entered, so deal with the case of the userId does not exists. ... Use same string resource value than Riot-Web	2020-04-22 23:03:04 +02:00
Benoit Marty	06cf59bca7	Even if it's not happening, do not add the search term if already present in the results.	2020-04-22 19:20:13 +02:00
Valere	e37dd547b8	code review	2020-04-22 18:50:59 +02:00
Benoit Marty	671c1259af	Merge pull request #1239 from waylon531/develop ... Use a bigger thread pool	2020-04-22 18:23:37 +02:00
Benoit Marty	3d07ccd98e	auto-review. Password could be only spaces...	2020-04-22 18:03:47 +02:00
Benoit Marty	03b9774c56	ktlint	2020-04-22 17:56:13 +02:00
Benoit Marty	0f1ddee71c	Use SwitchCompat	2020-04-22 17:54:25 +02:00
Benoit Marty	855efa93cc	Remove cancel button, useless.	2020-04-22 17:29:34 +02:00
Valere	d0f776a9cf	Discard session command only encrypted room	2020-04-22 16:41:34 +02:00
Benoit Marty	da66e38c68	Close drawer when opening settings	2020-04-22 16:02:06 +02:00
Benoit Marty	a4ba8c152d	Add IME action to the password field	2020-04-22 15:51:34 +02:00
Valere	9b320ed3c7	Fix unwedging	2020-04-22 15:40:59 +02:00
Benoit Marty	c854491248	Be more robust	2020-04-22 15:00:04 +02:00
Benoit Marty	5755d5bfaa	Deactivate account: unit test and cleanup	2020-04-22 14:36:01 +02:00
Benoit Marty	ff320fec55	Move internal class to internal package	2020-04-21 20:47:49 +02:00
Benoit Marty	8c8a84b039	Account deactivation: the task does the cleanup	2020-04-21 20:41:10 +02:00
Benoit Marty	045e3d7bae	Account deactivation (with password only) (#35)	2020-04-21 20:31:54 +02:00
Valere	491f0e6032	Merge pull request #1259 from vector-im/feature/restore_backup_from_ssss ... KeyBackup / Use 4S if key in quadS	2020-04-21 14:31:26 +02:00
onurays	3163bc8b80	Add user to direct chat by user id. ... Fixes #1065	2020-04-21 15:25:48 +03:00
Benoit Marty	eca3bf0817	typo	2020-04-21 13:49:36 +02:00
Valere	63355ca256	code review	2020-04-21 11:06:56 +02:00
Benoit Marty	c39a0e4fd5	timout -> timeout	2020-04-21 00:29:44 +02:00
Benoit Marty	59280ed18e	Small improvement in documentation	2020-04-21 00:29:02 +02:00
Benoit Marty	c1acb1af66	Add integration test for change password feature	2020-04-21 00:23:01 +02:00
Valere	8a4f0a0c00	KeyBackup / Use 4S if key in quadS	2020-04-20 19:21:44 +02:00
Benoit Marty	a6368c473e	Restart broken Olm sessions ([MSC1719](https://github.com/matrix-org/matrix-doc/pull/1719))	2020-04-20 18:07:14 +02:00
Benoit Marty	3615ca6b95	VersionName can be null when running integration test	2020-04-20 18:07:14 +02:00
Benoit Marty	ddb00ba23a	Enable Timber log in integration tests	2020-04-20 18:07:14 +02:00
Benoit Marty	91cf4b647d	var -> val	2020-04-20 18:07:14 +02:00
Benoit Marty	f989eed8b0	Use @Throws(MXCryptoError::class)	2020-04-20 18:07:14 +02:00
Benoit Marty	4d296ddc09	Avoid injecting credentials	2020-04-20 18:07:14 +02:00
Benoit Marty	6186c22e02	improve code	2020-04-20 18:07:14 +02:00
Benoit Marty	13cd13a42f	Create RoomEncryptorsStore	2020-04-20 18:07:14 +02:00
Benoit Marty	a42eb42178	Avoid injecting Credentials	2020-04-20 18:07:14 +02:00
Benoit Marty	7924ef207c	Add Javadoc	2020-04-20 18:07:14 +02:00
Benoit Marty	5900245018	Make the test fail before unwedging implementation	2020-04-20 18:07:14 +02:00
Benoit Marty	00c239bc42	cleanup	2020-04-20 18:07:14 +02:00
Benoit Marty	0cb43eef51	Add test for Unwedging (before implementing it)	2020-04-20 18:07:14 +02:00