Commit 316ffce3 authored 3 years ago by Benoit Marty

Merge branch 'release/1.2.1' into develop

parents 05e60992 7f51c3e2

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

CHANGES.md 8 additions, 0 deletions

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

matrix-sdk-android/build.gradle
matrix-sdk-android/lint.xml 0 additions, 34 deletions

matrix-sdk-android/lint.xml
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/PermalinkParserTest.kt 60 additions, 0 deletions

...idTest/java/org/matrix/android/sdk/PermalinkParserTest.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt 2 additions, 0 deletions

...st/java/org/matrix/android/sdk/common/CommonTestHelper.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestHelper.kt 2 additions, 0 deletions

...st/java/org/matrix/android/sdk/common/CryptoTestHelper.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/ssss/QuadSTests.kt 2 additions, 0 deletions

...org/matrix/android/sdk/internal/crypto/ssss/QuadSTests.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineForwardPaginationTest.kt 1 addition, 1 deletion

...dk/session/room/timeline/TimelineForwardPaginationTest.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelinePreviousLastForwardTest.kt 2 additions, 2 deletions

.../session/room/timeline/TimelinePreviousLastForwardTest.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceCreationTest.kt 16 additions, 17 deletions

...org/matrix/android/sdk/session/space/SpaceCreationTest.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceHierarchyTest.kt 7 additions, 2 deletions

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

...ain/java/org/matrix/android/sdk/api/failure/Extensions.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/GlobalError.kt 1 addition, 0 deletions

...in/java/org/matrix/android/sdk/api/failure/GlobalError.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/MatrixError.kt 25 additions, 0 deletions

...in/java/org/matrix/android/sdk/api/failure/MatrixError.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/PushRuleService.kt 4 additions, 1 deletion

...a/org/matrix/android/sdk/api/pushrules/PushRuleService.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/RuleIds.kt 5 additions, 0 deletions

...main/java/org/matrix/android/sdk/api/pushrules/RuleIds.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/VerificationService.kt 1 addition, 1 deletion

...dk/api/session/crypto/verification/VerificationService.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/identity/IdentityService.kt 14 additions, 0 deletions

...atrix/android/sdk/api/session/identity/IdentityService.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/PermalinkData.kt 21 additions, 0 deletions

...atrix/android/sdk/api/session/permalinks/PermalinkData.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/PermalinkParser.kt 67 additions, 12 deletions

...rix/android/sdk/api/session/permalinks/PermalinkParser.kt

with 246 additions and 80 deletions

Please register or to comment