filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
6,473 Commits 7 Branches 120 Tags 228 MiB
Commit Graph

2566 Commits

Author SHA1 Message Date
Benoit Marty b888d13e62 Use orEmpty() 2020-11-20 14:50:21 +01:00
Benoit Marty 1070c23608 QR code invite flow support - invite friends 
Author: Valere
 2020-11-20 14:50:21 +01:00
Benoit Marty 5b278f704c
Merge pull request #2427 from vector-im/feature/bma/dominaezz_cleanup 
Feature/bma/dominaezz cleanup
 2020-11-20 14:11:53 +01:00
Benoit Marty 85bc5f54aa
Merge branch 'develop' into feature/bma_create_room_form 2020-11-20 13:57:35 +01:00
Benoit Marty 41f46d0810
Merge pull request #2367 from vector-im/feature/bma/sanity_test 
Feature/bma/sanity test
 2020-11-20 13:56:49 +01:00
Benoit Marty 9ce1222fd0 Kotlin optimization form #1435 2020-11-20 09:07:29 +01:00
Benoit Marty 8fb3c68573 Kotlin optimization form #1435 2020-11-20 09:05:53 +01:00
Benoit Marty eb7ee49096 Kotlin optimization form #1435 2020-11-20 09:04:04 +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 0046fe25c5
Merge branch 'develop' into feature/ons/fix_badge_color 2020-11-19 17:00:49 +01:00
Benoit Marty fdb13f0b77
Merge pull request #2385 from vector-im/feature/bma/fdroid_60_timeout 
F-Droid version: ensure timeout of sync request can be more than 60 s…
 2020-11-19 16:59:40 +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 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 1eac90e5b1 Use plurals for proper i18n 2020-11-18 18:13:49 +01:00
Valere 206e68b1d2 Unused val 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
Dominic Fischer 1359c6be1d Missed a spot 
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
 2020-11-18 15:40:22 +00: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 92a6e9ea5a Remove redundant return 
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
 2020-11-18 14:23:59 +00:00
Dominic Fischer 822ce41b54 Remove redundant return 
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
 2020-11-18 14:22:07 +00:00
Benoit Marty 514263ae12 Room creation Fragment: no more "Retry" action, loading and error displayed in a dialog 2020-11-18 14:51:10 +01:00
Benoit Marty af8b400bf4 Room creation form: input an alias for public room (#1314) 2020-11-18 13:44:55 +01:00
Dominic Fischer a32d7f78bb Convert SearchService to suspend functions 
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
 2020-11-18 12:23:40 +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
Benoit Marty 579efb016a Room creation form: add advanced section to disable federation (#1314) 2020-11-16 18:02:18 +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
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
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 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 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 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
Onuray Sahin a1941bf609
Merge branch 'develop' into feature/ons/fix_badge_color 2020-11-10 17:20:52 +03: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
ganfra bf9d80c14c Merge branch 'develop' into feature/fix_user_vs_room_member 2020-11-10 15:15:28 +01:00