mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-12-26 19:08:44 +03:00
Code Issues Projects Releases Packages Wiki Activity
7172 commits 7 branches 124 tags 230 MiB
Commit graph

2397 commits

Author SHA1 Message Date
Benoit Marty
0d93105bcd Rended m.room.canonical_alias event in the timeline, considering alt_aliases (#2428) 2020-11-30 10:59:07 +01:00
Benoit Marty
03715e0939 Do not use m.room.aliases event to compute a room name (#2428) 2020-11-30 10:59:07 +01:00
Benoit Marty
4d9b9cb959 Deprecated event m.room.aliases 2020-11-30 10:59:07 +01:00
Benoit Marty
b004dfbdf2
Merge pull request #2457 from Dominaezzz/suspend_functions_2 
Convert IntegrationManagerService to suspend functions
 2020-11-30 10:49:46 +01:00
Benoit Marty
40ea91cce4
Merge pull request #2459 from Dominaezzz/suspend_functions_3 
Convert UploadsService to suspend functions
 2020-11-30 10:48:44 +01:00
Benoit Marty
abcb02d4aa
Merge pull request #2460 from Dominaezzz/suspend_functions 
Convert TermsService to suspend functions
 2020-11-30 10:47:55 +01:00
Benoit Marty
cd983de058 Fix cancellation of sending event (#2438) 2020-11-30 10:08:31 +01:00
Benoit Marty
f6cc05634f Send task: small rework and cleanup 2020-11-30 10:08:05 +01:00
Dominic Fischer
33a5cc1488 Remove redundant returns 
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
 2020-11-27 13:18:07 +00:00
Benoit Marty
bc889cbcf4
Merge pull request #2444 from vector-im/feature/bca/deeplink_mxto 
Fix issues with matrix.to deep linking
 2020-11-27 10:22:51 +01:00
Dominic Fischer
27050b911b Convert TermsService to suspend functions 
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
 2020-11-26 21:53:22 +00:00
Dominic Fischer
a3a2c0a9a8 Convert UploadsService to suspend functions 
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
 2020-11-26 21:51:58 +00:00
Dominic Fischer
92ceb0e8fb Convert IntegrationManagerService to suspend functions 
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
 2020-11-26 21:17:58 +00:00
Valere
4c599d3d40
Merge pull request #2451 from vector-im/feature/bca/fix_update_profile_no_rooms 
Fix / update profile when no rooms
 2020-11-26 15:09:40 +01:00
Valere
67057bfac4
Merge pull request #2417 from vector-im/feature/bca/quick_invite_dm_tab 
Feature/bca/quick invite dm tab
 2020-11-26 14:58:14 +01:00
Valere
fbc3f47eeb Fix / update profile when no rooms 2020-11-26 14:34:45 +01:00
Valere
8e6e6736a3 Code review 2020-11-26 09:09:27 +01:00
Valere
1f69c7e992 Better e2e log reporting 2020-11-20 17:37:20 +01:00
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
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
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
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
13ddc28d05 Fix issue with callback.onSuccess() called multiple times 2020-11-09 23:07:53 +01:00
Benoit Marty
fd4b56572d Use also{} to log info 2020-11-09 16:56:20 +01: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
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
9068168378
Merge branch 'develop' into feature/realm_10 2020-11-05 16:14:19 +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
ganfra
eb1fa0919f Room member: add methods to get directly from session 2020-11-04 18:09:51 +01:00
Onuray Sahin
9ed529b944
Merge branch 'develop' into feature/ons/fix_markdown_formatter 2020-11-04 13:43:26 +03:00
Onuray Sahin
bbc3dc0504 Set br softbreak to html parser. 2020-11-04 13:42:52 +03:00
Benoit Marty
d1d2c5f117
Merge pull request #2327 from vector-im/feature/bma/keysbackupcrash 
Feature/bma/keysbackupcrash
 2020-11-04 00:02:48 +01:00
ganfra
9f3f5d8053 Realm 10: upgrade lib and make it works on our current code. 2020-11-03 16:53:30 +01:00
Benoit Marty
997cd68344 Add some padding for easier readability 2020-11-03 09:57:34 +01:00
Onuray Sahin
b40334f7db Markdown body should be pure text, see #739, #1506. 2020-11-03 11:53:50 +03:00
Benoit Marty
a216f82b35 Avoid code duplication and log total count 2020-11-03 09:30:26 +01:00
Benoit Marty
5eb2f14375 Move RealmDebugTools and make it an internal class 2020-11-03 09:20:24 +01:00
Benoit Marty
d4963dfb31 Use the same name for the 2 db log methods 2020-11-03 09:17:07 +01:00
Valere
3c7f61e45c Clean oldest gossiping entries on open 
Add a dump of DB size on bug report
 2020-11-02 17:45:08 +01:00
Benoit Marty
1db120a963 cleanup 2020-10-30 18:08:11 +01:00
Benoit Marty
fca0aa2cc4 KeysBackup: Avoid using !!, should fix #2262 2020-10-30 17:17:25 +01:00
Benoit Marty
0bcf42dbb8 KeysBackup: some API parameters are mandatory, so stop considering them as optional and avoid using !! 
Also fix an issue with Json name: `hash` -> `etag`
Add some `internal` modifier (not as much as I would like to)
var -> val
Remove unused code
 2020-10-30 16:14:33 +01:00
Benoit Marty
14e7e5e9fd Avoid usage of !! 2020-10-30 14:29:44 +01:00
Benoit Marty
1fcbf7ed42 Release backupOlmPkEncryption 2020-10-30 14:16:04 +01:00
Benoit Marty
d654771fcf
Merge pull request #2318 from vector-im/feature/bca/fix_duplicate_reaction_echo 
Fix ui echo isues
 2020-10-30 11:56:51 +01:00
Benoit Marty
4791eb85af
Merge pull request #2283 from vector-im/feature/bca/crypto_perf 
Crypto cleaning and perf improvement
 2020-10-30 11:11:34 +01:00
Benoit Marty
41e3ff381f Rename method 2020-10-29 16:02:21 +01:00
Valere
479f10a28e Fix potential ConcurrentModificationException 
give a copy to avoid issues
 2020-10-29 14:36:40 +01:00
Benoit Marty
f48d4c021a Cleanup and split long lines 2020-10-29 14:10:41 +01:00
Benoit Marty
f190356934 Fix compilation warnings 2020-10-29 13:44:47 +01:00
Benoit Marty
1bc726abff Update the algorithm to find an existing DM: simplify and make sure there is only 2 people in the room 2020-10-29 13:25:21 +01:00
Valere
c2027be0ee Fix audit freeze, add export, and buffer gossip saves 2020-10-29 12:55:26 +01:00
Valere
5a111af2fe Fix / add close to IncomingRequestManager 2020-10-29 12:55:26 +01:00
Valere
bb000f77f8 Offload self verif todevice off crypto thread 2020-10-29 12:55:26 +01:00
Valere
6d2b3a6940 cleaning 2020-10-29 12:55:26 +01:00
Valere
dbb14e6313 offload megolm backup import off crypto thread 2020-10-29 12:55:26 +01:00
Valere
2144879e73 Offload sending keywithheld to computation 2020-10-29 12:55:26 +01:00
Valere
e149be9e0f Offload Incoming Gossip to dedicated thread 2020-10-29 12:55:26 +01:00
Valere
9e921d8b50 safeguard for save after store closed 2020-10-29 12:55:26 +01:00
Valere
9bf5059631 Fix test helper not working 2020-10-29 12:55:26 +01:00
Valere
b9fdc14e18 add internal 2020-10-29 12:55:26 +01:00
Valere
f39938d17d Fix / device check was not reading up to date trust 2020-10-29 12:55:26 +01:00
Valere
aa238775c6 Fix copyrights 2020-10-29 12:55:26 +01:00
Valere
7e7a953345 Crypto cleaning and perf improvement 2020-10-29 12:55:26 +01:00
Valere
9ec68fa5be Fix ui echo isues 2020-10-29 12:49:30 +01:00
Benoit Marty
d9723387eb We only need the roomId in many cases, so update the API 2020-10-29 11:00:01 +01:00
Benoit Marty
4433436416 Room member profile: Add action to create (or open) a DM (#2310) 2020-10-28 18:13:36 +01:00
Benoit Marty
1e60d6f6e8
Merge pull request #2282 from vector-im/feature/bma/room_settings 
Feature/bma/room settings
 2020-10-28 13:54:08 +01:00
Benoit Marty
b78dac20c0 Room profile: BigImageViewerActivity now only display the image. Use the room setting to change or delete the room Avatar 2020-10-28 11:22:37 +01:00
Benoit Marty
5a6683574c Toggle Low priority tag (#1490) 2020-10-23 14:58:31 +02:00
Benoit Marty
4b8c31d806 Add Avatar: SDK 
Also add remove avatar action, and add Crop UX
 2020-10-22 10:25:53 +02:00
Benoit Marty
f1e545ad49
Merge pull request #2264 from vector-im/feature/ons/fix_riotx_crypto_migration 
Fix crpyto store migration from RiotX.
 2020-10-20 22:15:21 +02:00
Valere
dc8a6cc745 Code review 2020-10-20 21:42:24 +02:00
Valere
d319a353d4 change log level 2020-10-20 21:42:24 +02:00
Valere
464ce16d63 fix sdk copyright 2020-10-20 21:41:48 +02:00
Valere
6cca87da49 Stop thread on close session 2020-10-20 21:41:48 +02:00
Valere
ace412f9e3 cleaning 2020-10-20 21:41:48 +02:00
Valere
41e168a519 add UI echo of reactions 2020-10-20 21:41:48 +02:00
Valere
47746d6997 Add event sender in app thread 2020-10-20 21:41:48 +02:00
Onuray Sahin
151f361954
Merge branch 'develop' into feature/ons/fix_riotx_crypto_migration 2020-10-19 11:15:04 +03:00
Onuray Sahin
6d3a659362 Benoit code review fixes. 2020-10-19 11:14:15 +03:00
Benoit Marty
0ffe20d863 Small changes 2020-10-16 16:50:51 +02:00
Benoit Marty
b07e7a4a36 Use file.length if cursor returns -1 as file size. 
Author: Onuray (squashed)
 2020-10-16 16:11:11 +02:00
Onuray Sahin
6531ba6a13 Fix crpyto store migration from RiotX. 
Fixes #2252
 2020-10-16 15:18:35 +03:00
Benoit Marty
79d7032e3a Don't set presence when handling a push notification or polling (#2156) 2020-10-13 22:34:08 +02:00
Benoit Marty
ede5bb0e90 Format files, in particular align -> 2020-10-13 14:57:45 +02:00
Benoit Marty
db1f129034 Improve detection of encrypted rooms 2020-10-13 11:27:46 +02:00
Benoit Marty
778c5aee32 Add param to when 2020-10-12 21:13:26 +02:00
Benoit Marty
63eb119df6 Inject userId and deviceId instead of sessionParam 2020-10-12 21:13:26 +02:00
Valere
840c8e0b91 Fix / reset cross signing not well supported 2020-10-12 17:10:46 +02:00
Benoit Marty
6f709a1e7c
Merge pull request #2203 from vector-im/feature/bma/pusher_data 
Feature/bma/pusher data
 2020-10-12 14:51:15 +02:00
Valere
b12c4f854c Fix / Moshi Cannot serialize kotlin 2020-10-09 15:40:30 +02:00
Benoit Marty
ab9bbe9a48 Cleanup and cancel request properly 2020-10-08 22:08:48 +02:00
Benoit Marty
5e45f5c3ea Copyright for SDK 2020-10-08 22:08:48 +02:00
Benoit Marty
5397700ab4 cleanup 2020-10-08 22:08:48 +02:00
Benoit Marty
48ca1384f8 Do some renaming, Sygnal is an implementation of a PushGateway. 2020-10-08 22:08:48 +02:00
Benoit Marty
02f1dab9b2 Push test: better error handling 2020-10-08 22:08:48 +02:00
Benoit Marty
7d53dfeca4 Add Sygnal API implementation to test is Push are correctly received 2020-10-08 22:08:48 +02:00
Benoit Marty
cb33b9f158 cleanup 2020-10-08 22:08:25 +02:00
Benoit Marty
cee5f8a0fb
Merge pull request #2230 from vector-im/feature/bma/sdk_copyright 
Sdk copyright
 2020-10-08 22:04:46 +02:00
Benoit Marty
bc339191ea Fix Copyright mention 2020-10-08 15:11:01 +02:00
Benoit Marty
44114e66c2 Fix Copyright mention in SDK code 2020-10-08 15:04:55 +02:00
Benoit Marty
1dfc739f19 Onuray's review 2020-10-08 14:19:56 +02:00
Benoit Marty
7952e205b9 Implement "Jump to read receipt" and "Mention" actions on the room member profile screen 2020-10-08 14:18:01 +02:00
Benoit Marty
182158c3af Fix runtime issue after upgrading Moshi library 2020-10-06 18:36:54 +02:00
Benoit Marty
dd1c9976e3 Fix runtime issue after upgrading Moshi library 2020-10-06 17:25:27 +02:00
Benoit Marty
e708b0f01b Fix compilation warning (due to Kotlin 1.4) 2020-10-06 15:09:41 +02:00
Benoit Marty
ebfee5868e Remove OkReplay, not compatible to build tools 4.0.1 (and not used) 2020-10-06 13:06:24 +02:00
Benoit Marty
72a412904d small cleanup 2020-10-06 12:26:18 +02:00
ganfra
dfbe1188f0 Draft: use session realm provider when possible 2020-10-06 10:17:17 +02:00
ganfra
91b81af5a8 Draft: handle sharing so it doesn't destroy the previous draft 2020-10-06 10:17:17 +02:00
ganfra
aa0520d47d Start reworking draft (simplify) 2020-10-06 10:13:14 +02:00
Benoit Marty
f030e098a8 Fix code quality and compilation test 2020-10-02 17:18:39 +02:00
Benoit Marty
3705fa14bd Use sender data return from search result 2020-10-01 17:03:53 +02:00
Benoit Marty
4649b2ac1d Code review 2020-10-01 16:09:06 +02:00
Onuray Sahin
4683dc3f21 Documentation added to orderByRecent parameter of the search request. 2020-10-01 14:50:29 +02:00
Onuray Sahin
e21f306635 Use enum directly instead of its value. 2020-10-01 14:50:29 +02:00
Onuray Sahin
430a0d2492 Create separate search module. 2020-10-01 14:50:29 +02:00
Onuray Sahin
8759bcca84 Map api response to a domain object. 2020-10-01 14:48:55 +02:00
Onuray Sahin
f1a979caa1 Make SearchTask accessible from room. 2020-10-01 14:48:55 +02:00
Onuray Sahin
7c954d220c Fix search request and response fields. 2020-10-01 14:48:55 +02:00
Onuray Sahin
8bff468c7c SearchService is added to the session. 2020-10-01 14:48:55 +02:00
Onuray Sahin
2eb60213b4 Do not support searching in multiple rooms for now. 2020-10-01 14:48:55 +02:00
Onuray Sahin
05f48255a3 Move search service into session module. 2020-10-01 14:48:55 +02:00
Onuray Sahin
d599cab017 SearchService implementation. 2020-10-01 14:48:55 +02:00
Onuray Sahin
b521f36569 SearchTask implementation. 2020-10-01 14:48:55 +02:00
Onuray Sahin
051b431f1d Search api added to RoomAPI. 2020-10-01 14:48:55 +02:00
Onuray Sahin
04b41fce30 Data classes for the search response created. 2020-10-01 14:48:55 +02:00
Onuray Sahin
5fcabca87c Data classes for request body created. 2020-10-01 14:48:55 +02:00
Benoit Marty
b14d22550b PR Review 
Cleanup and Add command line to run the UI tests
 2020-09-29 15:12:25 +02:00
Valere
bc2c345e21 First automated UI tests 2020-09-29 12:51:27 +02:00
Benoit Marty
8edecf5937 Allow using an outdated homeserver, at user's risk (#1972) 
Just warn the user using a non blocking popup
 2020-09-23 16:25:01 +02:00
Benoit Marty
d868ef0168 Create parent class for all MatrixWorker 2020-09-22 12:06:01 +02:00
Benoit Marty
4d9bd57336 Fix compilation issue after merge 2020-09-21 21:20:06 +02:00
Benoit Marty
30ab6d5ee7
Merge pull request #2147 from vector-im/feature/quick_fix 
Safe call to awaitCallback
 2020-09-21 21:18:36 +02:00
ganfra
4d558c5f95
Merge branch 'develop' into feature/fix_filtering_redacted 2020-09-21 20:25:49 +02:00
ganfra
a29ca2ae09 Clean after Benoit's review 2020-09-21 20:25:16 +02:00
Benoit Marty
d1fed08764 Rename tryThis to tryOrNull 2020-09-21 18:26:35 +02:00
Marinus Enzinger
822c47d15f Fix widget creation permission check 
Signed-off-by: Marinus Enzinger <marinus@enzingerm.de>
 2020-09-21 17:35:44 +02:00
ganfra
8279191339 Fix filtering of redacted events 2020-09-21 14:57:58 +02:00
ganfra
4d7b0e3e68 Merge branch 'develop' into feature/fix_sending_too_long 2020-09-21 10:17:52 +02:00
Benoit Marty
69a4312613
Merge branch 'develop' into feature/fix_regression_verif_dm 2020-09-21 09:52:58 +02:00
ganfra
d4682e504c Clean after Benoit's review 2020-09-18 18:34:40 +02:00
ganfra
2717cca267 Room sending: fix again loss of number type 2020-09-18 18:33:49 +02:00
Valere
28d37f0106 Fix / Verification in DM not working 
CheckNumberType crashing on timestamp number
 2020-09-18 18:03:09 +02:00
Benoit Marty
30b51449ce Manual import of Megolm keys does back up the imported keys 2020-09-18 15:28:06 +02:00
ganfra
72f8c8ef72 Clean and update CHANGES 2020-09-18 12:25:29 +02:00
ganfra
b227dc3e5c Sending: remove events from Worker params by fetching in db instead 2020-09-17 18:37:33 +02:00
ganfra
144d0e56cc Realm transaction, use semaphore as suggested by Dominaezzz 2020-09-17 18:31:47 +02:00
Benoit Marty
4c6234796d
Merge pull request #2111 from vector-im/feature/bma_raw_service 
Raw service
 2020-09-16 17:55:42 +02:00
Benoit Marty
b97aed0723 Ganfra's review 2020-09-16 17:00:14 +02:00
Benoit Marty
1614707943 Ganfra's review 2020-09-16 16:58:27 +02:00
Benoit Marty
82bf0dcae9 Create a RawService SDK side, to avoid that the SDK manage client needs 2020-09-16 16:17:10 +02:00
ganfra
a7ae66e0de Clean files and update CHANGES 2020-09-16 15:48:09 +02:00