Commit 439fe297 authored 4 years ago by Benoit Marty

Merge branch 'release/1.0.6' into develop

parents e13f2870 9249a54d

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 5 additions, 0 deletions

CHANGES.md
matrix-sdk-android/build.gradle 5 additions, 8 deletions

matrix-sdk-android/build.gradle
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/api/Matrix.kt 1 addition, 8 deletions

...src/androidTest/java/org/matrix/android/sdk/api/Matrix.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/AttachmentEncryptionTest.kt 19 additions, 22 deletions

...x/android/sdk/internal/crypto/AttachmentEncryptionTest.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParserTest.kt 146 additions, 66 deletions

...roid/sdk/internal/session/room/send/MarkdownParserTest.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/Matrix.kt 0 additions, 7 deletions

...ndroid/src/main/java/org/matrix/android/sdk/api/Matrix.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/wellknown/WellknownResult.kt 1 addition, 1 deletion

.../matrix/android/sdk/api/auth/wellknown/WellknownResult.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/Action.kt 31 additions, 28 deletions

.../main/java/org/matrix/android/sdk/api/pushrules/Action.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/Condition.kt 3 additions, 27 deletions

...in/java/org/matrix/android/sdk/api/pushrules/Condition.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/ContainsDisplayNameCondition.kt 4 additions, 31 deletions

...android/sdk/api/pushrules/ContainsDisplayNameCondition.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/EventMatchCondition.kt 19 additions, 33 deletions

...g/matrix/android/sdk/api/pushrules/EventMatchCondition.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/Kind.kt 39 additions, 0 deletions

...rc/main/java/org/matrix/android/sdk/api/pushrules/Kind.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/RoomMemberCountCondition.kt 2 additions, 4 deletions

...rix/android/sdk/api/pushrules/RoomMemberCountCondition.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/RuleIds.kt 2 additions, 0 deletions

...main/java/org/matrix/android/sdk/api/pushrules/RuleIds.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/SenderNotificationPermissionCondition.kt 2 additions, 4 deletions

...dk/api/pushrules/SenderNotificationPermissionCondition.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/rest/PushCondition.kt 10 additions, 8 deletions

...rg/matrix/android/sdk/api/pushrules/rest/PushCondition.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/rest/PushRule.kt 7 additions, 46 deletions

...ava/org/matrix/android/sdk/api/pushrules/rest/PushRule.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/rest/RuleSet.kt 2 additions, 1 deletion

...java/org/matrix/android/sdk/api/pushrules/rest/RuleSet.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/CallSignalingService.kt 2 additions, 0 deletions

...trix/android/sdk/api/session/call/CallSignalingService.kt

with 305 additions and 294 deletions

Please register or to comment