Matrix/element-android-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-android.git synced 2024-11-15 01:35:07 +08:00
Code Issues Packages Projects Releases Wiki Activity
6,430 Commits 530 Branches 157 Tags 485 MiB
d2880432da
Commit Graph

3929 Commits

Author SHA1 Message Date
Benoit Marty
d2880432da
Merge pull request #2366 from vector-im/feature/bma/cleanup 
Feature/bma/cleanup
 2020-11-19 17:49:17 +01:00
Benoit Marty
f9e4b689b7
Merge branch 'develop' into feature/bma/crop_issue 2020-11-19 17:25:36 +01:00
Benoit Marty
5eb50750e2
Merge branch 'develop' into feature/fix_user_vs_room_member 2020-11-19 17:02:35 +01:00
Benoit Marty
d5f83acaf5
Merge pull request #2414 from Dominaezzz/suspend_functions_2 
Convert PushRuleService to suspend functions
 2020-11-19 15:32:01 +01:00
Benoit Marty
465b33b006
Merge pull request #2407 from vector-im/feature/bma/move_enable_encryption 
Move "Enable Encryption" from room setting screen to room profile screen
 2020-11-19 15:17:13 +01:00
Benoit Marty
4df68479ac
Merge pull request #2369 from vector-im/feature/bca/quick_invite_room_tile 
EmptyRoom tile with quick actions
 2020-11-19 09:46:25 +01:00
Benoit Marty
3ec25f3634
Merge pull request #2413 from Dominaezzz/suspend_functions 
Convert Group to suspend functions
 2020-11-19 02:05:06 +01:00
Benoit Marty
c29e4648ea Small cleanup 2020-11-18 18:13:49 +01:00
Benoit Marty
9ed8f26d7c Make the room default avatar clickable to set it (as per the small picto) 
And do some cleanup
 2020-11-18 18:13:49 +01:00
Valere
1de5cd2e61 Code review 2020-11-18 18:13:49 +01:00
Valere
264bc52bcc WIP review 2020-11-18 18:13:49 +01:00
Valere
2626a761ea EmptyRoom tile with quick actions 2020-11-18 18:13:49 +01:00
Benoit Marty
ca0da2c509
Merge pull request #2405 from Dominaezzz/suspend_functions_1 
Convert DraftService to suspend functions
 2020-11-18 16:00:33 +01:00
Dominic Fischer
796ba72bde Reorder 
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
 2020-11-18 14:27:46 +00:00
Dominic Fischer
94b135ae95 Convert PushRuleService to suspend functions 
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
 2020-11-18 12:19:58 +00:00
Dominic Fischer
e42cad68b4 Convert Group to suspend functions 
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
 2020-11-18 12:16:53 +00:00
Dominic Fischer
82b21e6a09 Ensure draft is saved with NonCancellable 
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
 2020-11-17 10:53:57 +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
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
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
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
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
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
Dominic Fischer
3ce8deec07 Convert RoomCryptoService to suspend functions 
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
 2020-11-11 13:01:46 +00:00
ganfra
c9defec75d Update CHANGES and clean files 2020-11-10 15:18:41 +01:00
ganfra
bf9d80c14c Merge branch 'develop' into feature/fix_user_vs_room_member 2020-11-10 15:15:28 +01:00
Michael Telatynski
bbbaa60ddd
Merge branch 'develop' into fix_draft_sharesheet 2020-11-10 11:34:29 +00: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
cedeea13e6 Fix discard change dialog displayed by mistake when avatar has been updated 2020-11-09 23:00:19 +01: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
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
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