3862 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
Benoit Marty	41a8f40241	Improve API	2020-04-20 18:07:14 +02:00
Benoit Marty	a8641ef879	Split KeysBackup to several files. No other change.	2020-04-20 18:07:14 +02:00
Benoit Marty	4d207e6acd	Merge pull request #1258 from vector-im/feature/strings ... Strings	2020-04-20 17:41:50 +02:00
Valere	1227de3f9c	Merge pull request #1256 from vector-im/feature/increase_default_timeout ... Increase default timeout to match old riot	2020-04-20 17:13:59 +02:00
Benoit Marty	6cad129625	Still waiting for translation update	2020-04-20 16:13:16 +02:00
Benoit Marty	9ccf51fbc0	Import string from Riot - new strings	2020-04-20 15:20:08 +02:00
Benoit Marty	990867204e	Import string from Riot	2020-04-20 15:17:14 +02:00
Onuray Sahin	5795b7e063	Merge pull request #1242 from vector-im/feature/save_media_to_gallery ... Save media files to Gallery	2020-04-20 13:24:33 +03:00
Valere	b612a7e63c	Merge pull request #1252 from vector-im/feature/fix_device_detection_debounce ... Avoid unnecessary /device call	2020-04-20 12:07:17 +02:00
Valere	50c73b68aa	cleaning	2020-04-20 11:31:42 +02:00
Valere	c7ac5e2293	Increase default timeout to match old riot	2020-04-20 11:26:03 +02:00
Valere	43cb1fe68b	Code review	2020-04-20 11:12:35 +02:00
onurays	f807de9a83	Lint fix.	2020-04-20 11:53:33 +03:00
Onuray Sahin	754f220596	Merge branch 'develop' into feature/save_media_to_gallery	2020-04-20 11:21:14 +03:00
onurays	3f7ca8669a	Remove duplicated save icon.	2020-04-20 00:48:52 +03:00
Valere	28c6921a0a	Avoid unnecessary /device call	2020-04-17 18:08:29 +02:00
onurays	26bb8ce2be	Give user a toast after adding media file to the gallery.	2020-04-17 16:53:40 +03:00
onurays	8434f9326e	Save action added to bottom sheet.	2020-04-17 15:27:42 +03:00
Waylon Cude	68f93c6c31	Merge branch 'develop' of https://github.com/vector-im/riotX-android into develop ... Signed-off-by: Waylon Cude <waylon.cude@finzdani.net>	2020-04-16 12:19:17 -07:00
Benoit Marty	7961423556	Merge pull request #1244 from vector-im/feature/media_path ... Fix download and upload media path	2020-04-16 17:58:08 +02:00
Benoit Marty	ac07fb47d7	Better Kotlin code	2020-04-16 17:42:55 +02:00
Valere	fbcbd6def5	Merge pull request #1243 from vector-im/feature/update_x_signing_copy ... Feature/update x signing copy	2020-04-16 17:30:11 +02:00
Valere	3fe15f2d45	code review	2020-04-16 17:02:01 +02:00
Valere	968377a5be	Update vector/src/main/res/values/strings_riotX.xml ... Co-Authored-By: Benoit Marty <benoitm@matrix.org>	2020-04-16 16:53:24 +02:00
Benoit Marty	5652140f5d	Improve ContentUrlResolver	2020-04-16 16:41:45 +02:00
Benoit Marty	e97c95f40a	Fix issue with media path (Fixes #1227)	2020-04-16 16:41:45 +02:00