Commit 3448f844 authored 3 years ago by Benoit Marty

Merge branch 'release/1.4.2' into develop

parents 55cc7362 77200475

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

.idea/jarRepositories.xml 5 additions, 0 deletions

.idea/jarRepositories.xml
CHANGES.md 10 additions, 0 deletions

CHANGES.md
gradle.properties 1 addition, 1 deletion

gradle.properties
gradle/wrapper/gradle-wrapper.properties 2 additions, 2 deletions

gradle/wrapper/gradle-wrapper.properties
matrix-sdk-android/build.gradle 4 additions, 1 deletion

matrix-sdk-android/build.gradle
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt 29 additions, 2 deletions

...st/java/org/matrix/android/sdk/common/CommonTestHelper.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/threads/ThreadMessagingTest.kt 339 additions, 0 deletions

...x/android/sdk/session/room/threads/ThreadMessagingTest.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceHierarchyTest.kt 1 addition, 2 deletions

...rg/matrix/android/sdk/session/space/SpaceHierarchyTest.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/Matrix.kt 21 additions, 1 deletion

...ndroid/src/main/java/org/matrix/android/sdk/api/Matrix.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixConfiguration.kt 1 addition, 0 deletions

...in/java/org/matrix/android/sdk/api/MatrixConfiguration.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/PushRuleService.kt 3 additions, 0 deletions

...a/org/matrix/android/sdk/api/pushrules/PushRuleService.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/Event.kt 117 additions, 26 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/RelationType.kt 3 additions, 3 deletions

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

...roid/sdk/api/session/homeserver/HomeServerCapabilities.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/media/PreviewUrlData.kt 5 additions, 1 deletion

...rg/matrix/android/sdk/api/session/media/PreviewUrlData.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/Room.kt 2 additions, 0 deletions

...main/java/org/matrix/android/sdk/api/session/room/Room.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomService.kt 7 additions, 0 deletions

...va/org/matrix/android/sdk/api/session/room/RoomService.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/members/MembershipService.kt 0 additions, 10 deletions

...android/sdk/api/session/room/members/MembershipService.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/ReadReceipt.kt 1 addition, 3 deletions

.../matrix/android/sdk/api/session/room/model/ReadReceipt.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageLocationContent.kt 8 additions, 0 deletions

.../api/session/room/model/message/MessageLocationContent.kt

with 572 additions and 52 deletions

Please register or to comment