Commit beb648b2 authored 2 years ago by Taras

Merge branch 'develop' into main

parents 232684c0 10897b20

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

CHANGES.md 9 additions, 0 deletions

CHANGES.md
dependencies.gradle 12 additions, 13 deletions

dependencies.gradle
dependencies_groups.gradle 0 additions, 1 deletion

dependencies_groups.gradle
gradle.properties 1 addition, 1 deletion

gradle.properties
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixConfiguration.kt 6 additions, 0 deletions

...in/java/org/matrix/android/sdk/api/MatrixConfiguration.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/extensions/MetricsExtensions.kt 41 additions, 0 deletions

...rg/matrix/android/sdk/api/extensions/MetricsExtensions.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/logger/LoggerTag.kt 1 addition, 0 deletions

.../main/java/org/matrix/android/sdk/api/logger/LoggerTag.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/metrics/DownloadDeviceKeysMetricsPlugin.kt 32 additions, 0 deletions

...ndroid/sdk/api/metrics/DownloadDeviceKeysMetricsPlugin.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/metrics/MetricPlugin.kt 46 additions, 0 deletions

...n/java/org/matrix/android/sdk/api/metrics/MetricPlugin.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/Rendezvous.kt 229 additions, 0 deletions

.../java/org/matrix/android/sdk/api/rendezvous/Rendezvous.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/RendezvousChannel.kt 51 additions, 0 deletions

...rg/matrix/android/sdk/api/rendezvous/RendezvousChannel.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/RendezvousFailureReason.kt 32 additions, 0 deletions

...rix/android/sdk/api/rendezvous/RendezvousFailureReason.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/RendezvousTransport.kt 36 additions, 0 deletions

.../matrix/android/sdk/api/rendezvous/RendezvousTransport.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/channels/ECDHRendezvousChannel.kt 183 additions, 0 deletions

...roid/sdk/api/rendezvous/channels/ECDHRendezvousChannel.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/ECDHRendezvous.kt 26 additions, 0 deletions

...matrix/android/sdk/api/rendezvous/model/ECDHRendezvous.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/ECDHRendezvousCode.kt 25 additions, 0 deletions

...ix/android/sdk/api/rendezvous/model/ECDHRendezvousCode.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/Outcome.kt 38 additions, 0 deletions

...va/org/matrix/android/sdk/api/rendezvous/model/Outcome.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/Payload.kt 36 additions, 0 deletions

...va/org/matrix/android/sdk/api/rendezvous/model/Payload.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/PayloadType.kt 32 additions, 0 deletions

...rg/matrix/android/sdk/api/rendezvous/model/PayloadType.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/Protocol.kt 26 additions, 0 deletions

...a/org/matrix/android/sdk/api/rendezvous/model/Protocol.kt

with 862 additions and 15 deletions

Please register or to comment