6487 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Benoit Marty	d1e2d06538	Add userConsent UI to the Discovery screen	2020-11-11 16:15:38 +01:00
Benoit Marty	ccf5d759a4	Add userConsent to the Identity database and migrate the DB	2020-11-11 15:12:49 +01:00
Dominic Fischer	3ce8deec07	Convert RoomCryptoService to suspend functions ... Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>	2020-11-11 13:01:46 +00:00
Benoit Marty	812b1f7baa	Merge pull request #2364 from Dominaezzz/fix_draft_sharesheet ... Fix draft share sheet	2020-11-11 13:08:45 +01:00
Benoit Marty	d1848fd5f7	Fix compilation issue :)	2020-11-10 16:01:19 +01:00
Benoit Marty	f57fc827fe	Last cleanup	2020-11-10 15:37:28 +01:00
Benoit Marty	45e534bbf5	DRY again	2020-11-10 15:33:24 +01:00
Benoit Marty	bfcd4b8250	Extract AttachmentProviderFactory to its own file	2020-11-10 15:26:59 +01:00
Benoit Marty	510f8ae0f5	DRY	2020-11-10 15:26:13 +01:00
Onuray Sahin	a1941bf609	Merge branch 'develop' into feature/ons/fix_badge_color	2020-11-10 17:20:52 +03:00
ganfra	c9defec75d	Update CHANGES and clean files	2020-11-10 15:18:41 +01:00
Onuray Sahin	a2a2015af6	Exclude yourself when decorating rooms which are direct or don't have more than 2 users.	2020-11-10 17:17:05 +03:00
Benoit Marty	ca70ddb810	DRY	2020-11-10 15:15:42 +01:00
ganfra	bf9d80c14c	Merge branch 'develop' into feature/fix_user_vs_room_member	2020-11-10 15:15:28 +01:00
Benoit Marty	83467b8597	Fix crash on AttachmentViewer (#2365) ... Not sure how to reproduce it, but if the value is -1, it will crash for sure	2020-11-10 15:12:21 +01:00
Benoit Marty	816301bf8d	More cleanup	2020-11-10 15:09:49 +01:00
Benoit Marty	345e8a0679	i18n	2020-11-10 15:06:51 +01:00
Benoit Marty	bcd384c31c	Small cleanup	2020-11-10 14:46:19 +01:00
Michael Telatynski	bbbaa60ddd	Merge branch 'develop' into fix_draft_sharesheet	2020-11-10 11:34:29 +00:00
Benoit Marty	dc17e5c3fa	Update CHANGES.md after merge of #2354	2020-11-10 10:39:34 +01:00
Benoit Marty	0150d3961b	Merge pull request #2354 from Dominaezzz/suspend_functions ... Convert `AccountService` to suspend functions	2020-11-10 10:36:44 +01:00
Benoit Marty	ae3e1f3a9f	Merge pull request #2368 from vector-im/feature/bma/fix_discard ... Feature/bma/fix discard	2020-11-10 09:11:55 +01:00
Benoit Marty	13ddc28d05	Fix issue with callback.onSuccess() called multiple times	2020-11-09 23:07:53 +01:00
Benoit Marty	cedeea13e6	Fix discard change dialog displayed by mistake when avatar has been updated	2020-11-09 23:00:19 +01:00
Benoit Marty	8f78c4a0fb	Fix issue of verification banner displayed after logout	2020-11-09 21:08:53 +01:00
Benoit Marty	a37af307f4	Making progress	2020-11-09 20:03:44 +01:00
Dominic Fischer	be3bc175bf	Update CHANGES.md ... Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>	2020-11-09 18:23:45 +00:00
Dominic Fischer	6207aab19d	Remove cancellation handling ... Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>	2020-11-09 17:20:23 +00:00
Benoit Marty	01a5ec4c41	Go deeper in the settings	2020-11-09 16:56:20 +01:00
Benoit Marty	b09d45718a	Make id for recyclerView less generic, and remove unused layout	2020-11-09 16:56:20 +01:00
Benoit Marty	07c805a019	Create sanity test with all screens path ... Introduce `com.schibsted.spain:barista`	2020-11-09 16:56:20 +01:00
Benoit Marty	ea4e9b8e5e	Fix "Riot is now Element" dialog displayed by mistake, after a logout	2020-11-09 16:56:20 +01:00
Benoit Marty	fd4b56572d	Use also{} to log info	2020-11-09 16:56:20 +01:00
Benoit Marty	16448c0bc5	Add Github link to the authors	2020-11-09 16:53:17 +01:00
Benoit Marty	c34750bdab	Add Onuray in the core team authors	2020-11-09 16:49:31 +01:00
Dominic Fischer	dee6f35888	Fix draft bug ... Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>	2020-11-08 14:57:15 +00:00
Dominic Fischer	62ca9a2a84	Fix misleading identifier ... Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>	2020-11-08 14:37:02 +00:00
Dominic Fischer	0da4ff7b02	Run ktlint	2020-11-06 19:20:23 +00:00
Dominic Fischer	983e02888c	Remove incorrect comment ... Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>	2020-11-06 19:17:45 +00:00
Dominic Fischer	35768ff7e8	Convert AccountService to suspend functions ... Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>	2020-11-06 16:49:51 +00:00
ganfra	6dfdc77ebd	Use room member instead of user when it makes sense	2020-11-06 14:41:43 +01:00
Benoit Marty	0753ba3495	Merge pull request #2342 from vector-im/feature/ons/open_existing_dm ... Navigate to an existing DM instead of creating a new one.	2020-11-06 11:29:20 +01:00
Benoit Marty	51a95554d7	Remove useless code. We can now inject element in the Fragment constructors	2020-11-05 18:30:00 +01:00
Benoit Marty	12d8bd1743	Cleanup after rebase - avoid computing twice the existing roomId	2020-11-05 17:34:10 +01:00
Onuray Sahin	458b4259fe	Change menu action title for existing rooms.	2020-11-05 17:02:13 +01:00
Onuray Sahin	e7714da8e8	Navigate to an existing DM instead of creating a new one.	2020-11-05 17:02:13 +01:00
Benoit Marty	b4f9d40767	Merge pull request #2344 from vector-im/feature/bma/sync_h ... Small fixes	2020-11-05 16:58:46 +01:00
Benoit Marty	a0e074043b	Merge pull request #2339 from vector-im/feature/realm_10 ... Realm 10: upgrade lib	2020-11-05 16:57:24 +01:00
Benoit Marty	9068168378	Merge branch 'develop' into feature/realm_10	2020-11-05 16:14:19 +01:00
Benoit Marty	de39a17247	Fix issue on setting avatar on a room. ... We deleted the just added avatar because `withState {}` is asynchronous	2020-11-05 16:09:04 +01:00