Commit c4a14f65 authored 2 years ago by Taras

Merge branch 'develop' into main

parents 1a3739b6 52a546c2

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 2 additions, 0 deletions

.gitignore
CHANGES.md 11 additions, 0 deletions

CHANGES.md
dependencies.gradle 6 additions, 6 deletions

dependencies.gradle
gradle.properties 1 addition, 1 deletion

gradle.properties
gradle/wrapper/gradle-wrapper.properties 1 addition, 0 deletions

gradle/wrapper/gradle-wrapper.properties
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/search/SearchMessagesTest.kt 26 additions, 4 deletions

...g/matrix/android/sdk/session/search/SearchMessagesTest.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/extensions/MetricsExtensions.kt 30 additions, 4 deletions

...rg/matrix/android/sdk/api/extensions/MetricsExtensions.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/metrics/SpannableMetricPlugin.kt 36 additions, 0 deletions

...g/matrix/android/sdk/api/metrics/SpannableMetricPlugin.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/metrics/SyncDurationMetricPlugin.kt 32 additions, 0 deletions

...atrix/android/sdk/api/metrics/SyncDurationMetricPlugin.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/CryptoService.kt 3 additions, 0 deletions

...rg/matrix/android/sdk/api/session/crypto/CryptoService.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/Event.kt 1 addition, 1 deletion

.../org/matrix/android/sdk/api/session/events/model/Event.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/homeserver/HomeServerCapabilities.kt 5 additions, 0 deletions

...roid/sdk/api/session/homeserver/HomeServerCapabilities.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/homeserver/HomeServerCapabilitiesService.kt 8 additions, 0 deletions

...k/api/session/homeserver/HomeServerCapabilitiesService.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineEvent.kt 3 additions, 1 deletion

...ix/android/sdk/api/session/room/timeline/TimelineEvent.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/version/Versions.kt 11 additions, 0 deletions

.../org/matrix/android/sdk/internal/auth/version/Versions.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt 5 additions, 1 deletion

...atrix/android/sdk/internal/crypto/DefaultCryptoService.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DeviceListManager.kt 1 addition, 1 deletion

...g/matrix/android/sdk/internal/crypto/DeviceListManager.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/api/CryptoApi.kt 12 additions, 0 deletions

...a/org/matrix/android/sdk/internal/crypto/api/CryptoApi.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/DeleteDeviceParams.kt 4 additions, 1 deletion

...roid/sdk/internal/crypto/model/rest/DeleteDeviceParams.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/DeleteDevicesParams.kt 37 additions, 0 deletions

...oid/sdk/internal/crypto/model/rest/DeleteDevicesParams.kt

with 235 additions and 20 deletions

Please register or to comment