mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2025-01-04 07:17:41 +03:00
Code Issues Projects Releases Packages Wiki Activity
8492 commits 7 branches 124 tags 230 MiB
Commit graph

3262 commits

Author SHA1 Message Date
Damir Jelić
fe4abbbeef crypto: Fix a bunch of linter warnings 2021-04-27 16:33:13 +02:00
Damir Jelić
324cdc4db1 Merge remote-tracking branch 'upstream/develop' into rust 2021-04-20 14:44:02 +02:00
Damir Jelić
326641a7e5 crypto: Document the requestRoomKey method 2021-04-20 14:40:58 +02:00
Damir Jelić
711e607fca crypto: Improve the docs a bit 2021-04-20 14:34:54 +02:00
Damir Jelić
389273d56a crypto: Rename the share_group_session method 2021-04-20 14:34:32 +02:00
Damir Jelić
09c0ca10e5 crypto: Enable the sending of outgoing to-device requests 2021-04-20 14:33:43 +02:00
Damir Jelić
ed902fc42a crypto: Improve the startup log line 2021-04-20 14:33:01 +02:00
Damir Jelić
8bfb7a6e0c crypto: Connect the room key requesting to the rust side 2021-04-20 13:29:52 +02:00
Damir Jelić
0db07011b1 crypto: Return our own device from the store as well 
The Kotlin side doesn't differentiate between our own device and other
devices of our own user while the Rust side does, create and return our
own device when it's requested from the store using trusted data.
 2021-04-19 19:25:56 +02:00
Damir Jelić
91d28658fc crypto: Correctly decode the byte array when importing keys 2021-04-19 18:04:11 +02:00
Benoit Marty
9565e8975e merge hotfix to develop 2021-04-15 11:09:58 +02:00
Benoit Marty
59637c4a6b Revert to Realm 10.3.1 to fix issue with migration 
Waiting for https://github.com/realm/realm-java/issues/7402
 2021-04-14 21:54:07 +02:00
Damir Jelić
0afdcb35f1 crypto: Clean up some log lines 2021-04-14 12:46:29 +02:00
Benoit Marty
699b1429b7 Simplify LoginFlowResult model 2021-04-14 12:42:47 +02:00
Damir Jelić
2805772d0a crypto: Notify the rest of the code about received room keys 2021-04-14 12:16:46 +02:00
Damir Jelić
3ba29b4ea9 crypto: Prepare outgoing to-device requests to be sent out 2021-04-14 12:16:09 +02:00
Damir Jelić
aebfef8fa9 crypto: Remove a unused method 2021-04-14 12:15:30 +02:00
Damir Jelić
543a638e87 crypto: Forward some more errors from the rust side to the kotlin side 2021-04-12 15:03:28 +02:00
Benoit Marty
288aed3252
Merge pull request #3151 from vector-im/feature/bma/cleanup_resources 
Store description update
 2021-04-12 10:47:18 +02:00
Dominic Fischer
7ee87a0d4b Merge branch 'develop' into suspend_functions_1 
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomService.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt
#	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
 2021-04-10 16:50:30 +01:00
Damir Jelić
e9e3d129ba crypto: Send out some of our requests in parallel 2021-04-09 19:10:25 +02:00
Benoit Marty
37226a1641 Small cleanup 2021-04-09 16:58:41 +02:00
Benoit Marty
388e4eb112
Merge pull request #3137 from vector-im/dependabot/gradle/daggerVersion-2.34 
Bump daggerVersion from 2.33 to 2.34
 2021-04-09 16:38:25 +02:00
Damir Jelić
99477914df crypto: Remove the higher level Device since it's unlikely we'll be using it 2021-04-09 14:47:59 +02:00
Damir Jelić
9296cab4fc crypto: Expose more device data from the rust side 2021-04-09 13:53:55 +02:00
Damir Jelić
188d2d57c0 crypto: Use a concurrent hashmap for the live devices update logic 2021-04-09 13:53:31 +02:00
Damir Jelić
74a1c226a4 crypto: Introduce some locks for some of our e2ee operations 2021-04-09 12:42:22 +02:00
Damir Jelić
8692f05e34 crypto: Connect the room key discarding logic 2021-04-09 12:35:13 +02:00
Damir Jelić
427eb5e249 Merge remote-tracking branch 'upstream/develop' into rust 2021-04-09 09:47:00 +02:00
Benoit Marty
ee3eb8e1d6 Cleanup 2021-04-08 18:52:53 +02:00
Benoit Marty
2a1e52745f Some cleanup after merge of #3084 2021-04-08 18:50:28 +02:00
Aleks
9d96f90e49 keyword-spacing fix + wildcard-imports fix 2021-04-08 18:50:28 +02:00
Aleks
4451b682b1 merge + register/available endpoint corrections 2021-04-08 18:50:28 +02:00
Aleks
2e9f8ae6ae registration availability endpoint added 2021-04-08 18:50:05 +02:00
Damir Jelić
5253f9708c crypto: Fix a crash when we access the devices before the olmMachine is set up 
The crypto service is fully initialized only after the first sync but EA
seems to access live devices before that. This results in a crash since
we now use the olm machine to access devices.
 2021-04-08 15:55:38 +02:00
Damir Jelić
edfd1b2fe0 crypto: Get rid of the DeviceKeysManager 2021-04-08 15:55:10 +02:00
Benoit Marty
7b1d313e8e Small cleanup 2021-04-08 12:46:55 +02:00
Damir Jelić
08d0787cc9 crypto: More docs 2021-04-08 11:18:48 +02:00
Benoit Marty
8dead986a5 Always try to retry Http requests in case of 429 (#1300) 2021-04-08 10:59:51 +02:00
Benoit Marty
9b5bc60fa9 Remove unused parameter and use same value than the JS SDK 2021-04-08 09:54:51 +02:00
dependabot[bot]
505b01ad97
Bump daggerVersion from 2.33 to 2.34 
Bumps `daggerVersion` from 2.33 to 2.34.

Updates `dagger` from 2.33 to 2.34
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.33...dagger-2.34)

Updates `dagger-compiler` from 2.33 to 2.34
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.33...dagger-2.34)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-08 07:19:20 +00:00
Benoit Marty
3b6234a9a2
Merge pull request #3133 from vector-im/feature/bma/wl_fixes 
Weblate fixes
 2021-04-07 19:11:16 +02:00
Benoit Marty
e7608469ca Import SAS strings 2021-04-07 18:42:52 +02:00
Benoit Marty
eef6d92b89
Merge pull request #3129 from vector-im/feature/bma/dn_iteration 
Empty room name small iteration
 2021-04-07 18:41:08 +02:00
Benoit Marty
7309c1066c Move WifiDetector to the app side 
And protect the call to getEvent()
 2021-04-07 17:35:46 +02:00
Benoit Marty
dead57b9fe Cleanup 2021-04-07 17:35:46 +02:00
Benoit Marty
b89a258fdf FastLane: Only is Wifi is detected 2021-04-07 17:35:46 +02:00
Benoit Marty
c46f7fed5f Avoid code duplication 2021-04-07 17:35:46 +02:00
Benoit Marty
3a1b8bc33d FastLane: handle push rules 2021-04-07 17:35:46 +02:00
Benoit Marty
f0f66cbd0e Add comment 2021-04-07 17:35:46 +02:00