Commit 85701306 authored 2 years ago by Taras

Merge branch 'develop' into main

parents b30620be c7bc8f8a

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

CHANGES.md 11 additions, 0 deletions

CHANGES.md
dependencies.gradle 3 additions, 3 deletions

dependencies.gradle
gradle.properties 1 addition, 1 deletion

gradle.properties
matrix-sdk-android/src/androidTest/assets/session_42.realm 0 additions, 0 deletions

matrix-sdk-android/src/androidTest/assets/session_42.realm
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt 5 additions, 0 deletions

...st/java/org/matrix/android/sdk/common/CommonTestHelper.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration43Test.kt 130 additions, 0 deletions

...sdk/internal/database/RealmSessionStoreMigration43Test.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/database/SessionSanityMigrationTest.kt 64 additions, 0 deletions

...droid/sdk/internal/database/SessionSanityMigrationTest.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/database/TestRealmConfigurationFactory.kt 196 additions, 0 deletions

...id/sdk/internal/database/TestRealmConfigurationFactory.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/PollAggregationTest.kt 1 addition, 1 deletion

.../android/sdk/session/room/timeline/PollAggregationTest.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/AggregatedAnnotation.kt 0 additions, 1 deletion

...roid/sdk/api/session/events/model/AggregatedAnnotation.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/AggregatedRelations.kt 4 additions, 2 deletions

...droid/sdk/api/session/events/model/AggregatedRelations.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/AggregatedReplace.kt 33 additions, 0 deletions

...android/sdk/api/session/events/model/AggregatedReplace.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/Event.kt 13 additions, 17 deletions

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

...g/matrix/android/sdk/api/session/events/model/EventExt.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/EventType.kt 7 additions, 12 deletions

.../matrix/android/sdk/api/session/events/model/EventType.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/ValidDecryptedEvent.kt 37 additions, 0 deletions

...droid/sdk/api/session/events/model/ValidDecryptedEvent.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/location/LocationSharingService.kt 1 addition, 2 deletions

...d/sdk/api/session/room/location/LocationSharingService.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/EditAggregatedSummary.kt 2 additions, 2 deletions

...droid/sdk/api/session/room/model/EditAggregatedSummary.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/ReadReceipt.kt 2 additions, 1 deletion

.../matrix/android/sdk/api/session/room/model/ReadReceipt.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageStickerContent.kt 1 addition, 1 deletion

...k/api/session/room/model/message/MessageStickerContent.kt

with 557 additions and 43 deletions

Please register or to comment