Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

M

matrix-android-sdk
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

55cc7362

Commit 55cc7362 authored 3 years ago by Benoit Marty

Downloads
- Plain Diff

Merge branch 'release/1.3.18' into develop

parents 787bb776 2dac1ce0

No related branches found

No related tags found

Loading

Changes 67

Hide whitespace changes

Inline Side-by-side

Showing

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/SendStateTask.kt 2 additions, 2 deletions

.../android/sdk/internal/session/room/state/SendStateTask.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt 59 additions, 4 deletions

.../org/matrix/android/sdk/internal/session/sync/SyncTask.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt 50 additions, 1 deletion

...sdk/internal/session/sync/handler/room/RoomSyncHandler.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncService.kt 1 addition, 1 deletion

...trix/android/sdk/internal/session/sync/job/SyncService.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncThread.kt 5 additions, 4 deletions

...atrix/android/sdk/internal/session/sync/job/SyncThread.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncWorker.kt 2 additions, 1 deletion

...atrix/android/sdk/internal/session/sync/job/SyncWorker.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/terms/DefaultTermsService.kt 1 addition, 1 deletion

...android/sdk/internal/session/terms/DefaultTermsService.kt

with 120 additions and 14 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment