Commit graph

6466 commits

Author SHA1 Message Date
gradle-update-robot
9216eed1b8 Update Gradle Wrapper from 6.7 to 6.7.1.
Signed-off-by: gradle-update-robot <gradle-update-robot@regolo.cc>
2020-11-17 00:40:54 +00:00
Benoit Marty
579efb016a Room creation form: add advanced section to disable federation (#1314) 2020-11-16 18:02:18 +01:00
Benoit Marty
2b1b9d35a2
Merge pull request #2406 from Dominaezzz/suspend_functions
Convert RawService to suspend functions
2020-11-16 15:47:50 +01:00
Dominic Fischer
3d970737d1 Remove redundant return
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
2020-11-16 14:45:42 +00:00
Benoit Marty
75c105a400 Move "Enable Encryption" from room setting screen to room profile screen (#2394) 2020-11-16 15:08:10 +01:00
Dominic Fischer
0a318f618b Convert RawService to suspend functions
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
2020-11-16 13:48:19 +00:00
Dominic Fischer
574d5055bd Convert DraftService to suspend functions
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
2020-11-16 13:46:24 +00:00
Benoit Marty
0022777a4f
Merge pull request #2377 from vector-im/feature/bma/consent
Feature/bma/consent
2020-11-16 13:43:30 +01:00
Benoit Marty
4c6996bc09
Merge branch 'develop' into feature/bma/consent 2020-11-16 13:43:02 +01:00
Benoit Marty
6ff12b3a88
Merge pull request #2402 from Dominaezzz/suspend_functions_1
Convert ReportingService to suspend functions
2020-11-16 13:39:47 +01:00
Benoit Marty
babbb82a49
Merge pull request #2401 from Dominaezzz/suspend_functions
Convert TagsService to suspend functions
2020-11-16 13:38:22 +01:00
Benoit Marty
ae5331cf40
Merge pull request #2397 from vector-im/feature/bma/registration_email
Registration: annoying error message scares every new user when they add an email (#2391)
2020-11-16 13:36:45 +01:00
Dominic Fischer
d67029c42c Convert ReportingService to suspend functions
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
2020-11-16 11:47:18 +00:00
Dominic Fischer
4dff9316c2 Convert TagsService to suspend functions
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
2020-11-16 11:44:30 +00:00
Benoit Marty
a056cbd19f Registration: annoying error message scares every new user when they add an email (#2391) 2020-11-16 10:57:29 +01:00
Benoit Marty
64c612dea0 F-Droid version: ensure timeout of sync request can be more than 60 seconds (#2169) 2020-11-13 19:14:50 +01:00
Benoit Marty
f2e8a9e0c7 Un configure the template, to be able to upgrade Android Studio 2020-11-13 18:25:25 +01:00
Benoit Marty
8ae0501c22 Try to fix cropped image in timeline (#2126) 2020-11-13 17:52:02 +01:00
Benoit Marty
8dff0b2c5d Cleanup 2020-11-13 15:33:44 +01:00
Benoit Marty
a713b97e36
Merge pull request #2382 from Dominaezzz/suspend_functions_1
Convert RoomPushRuleService to suspend functions
2020-11-13 15:25:31 +01:00
Benoit Marty
b6acc8da70
Merge pull request #2376 from Dominaezzz/suspend_functions
Convert RoomCryptoService to suspend functions
2020-11-13 15:23:06 +01:00
Benoit Marty
b8c89325bc Improve Javadoc 2020-11-13 11:25:18 +01:00
Benoit Marty
b99cdf7367 Handle events of type "m.room.server_acl" - details only in developer mode (#890) 2020-11-13 11:07:50 +01:00
Dominic Fischer
60ce351a27 Convert RoomPushRuleService to suspend functions
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
2020-11-13 00:10:53 +00:00
Benoit Marty
413a55623e Handle events of type "m.room.server_acl" (#890) 2020-11-13 00:39:16 +01:00
Benoit Marty
daac2e2a1c Better rational 2020-11-12 17:21:48 +01:00
Onuray Sahin
b88ec407a3
Merge branch 'develop' into feature/ons/fix_badge_color 2020-11-12 14:57:03 +03:00
Benoit Marty
6020f423f4 Ask for explicit user consent to send their contact details to the identity server (#2375) 2020-11-11 17:51:39 +01:00
Benoit Marty
99bea8f7c3 small change in signature 2020-11-11 16:40:33 +01:00
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