jarno
/
element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,382 Commits 4 Branches 3 Tags 186 MiB
Commit Graph

6382 Commits

Author SHA1 Message Date
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
Dominic Fischer 0a318f618b Convert RawService to suspend functions 
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
 2020-11-16 13:48:19 +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 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
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
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
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
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
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 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
Benoit Marty 5c7a5fab94 Improve API: rename the method and return empty list instead of null 2020-11-05 15:47:28 +01:00
Benoit Marty c9e0aff839 DRY 2020-11-05 15:42:44 +01:00
Benoit Marty 61ed436c44 Move some method to the companion 2020-11-05 15:41:52 +01:00
Benoit Marty b7a1f96294 Append to file but before the extension 2020-11-05 15:40:12 +01:00