Commit 25e4fa92 authored 3 years ago by Benoit Marty

Merge branch 'release/1.1.13' into main

parents c61bdecf e29ebdb7

No related branches found

No related tags found

No related merge requests found

Expand all Hide whitespace changes

Inline Side-by-side

Showing

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt 2 additions, 1 deletion

...android/sdk/internal/session/space/DefaultSpaceService.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt 1 addition, 1 deletion

.../org/matrix/android/sdk/internal/session/sync/SyncTask.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/UserAccountDataSyncHandler.kt 5 additions, 5 deletions

...d/sdk/internal/session/sync/UserAccountDataSyncHandler.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/accountdata/UserAccountDataSync.kt 2 additions, 2 deletions

...nal/session/sync/model/accountdata/UserAccountDataSync.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/parsing/RoomSyncAccountDataHandler.kt 0 additions, 1 deletion

...ternal/session/sync/parsing/RoomSyncAccountDataHandler.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/DefaultSessionAccountDataService.kt 25 additions, 14 deletions

...sion/user/accountdata/DefaultSessionAccountDataService.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/DirectChatsHelper.kt 3 additions, 1 deletion

...dk/internal/session/user/accountdata/DirectChatsHelper.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/UserAccountDataDataSource.kt 5 additions, 5 deletions

...nal/session/user/accountdata/UserAccountDataDataSource.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/WidgetManager.kt 6 additions, 6 deletions

...rix/android/sdk/internal/session/widgets/WidgetManager.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/helper/UserAccountWidgets.kt 2 additions, 2 deletions

...sdk/internal/session/widgets/helper/UserAccountWidgets.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/file/AtomicFileCreator.kt 42 additions, 0 deletions

...atrix/android/sdk/internal/util/file/AtomicFileCreator.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/wellknown/GetWellknownTask.kt 8 additions, 11 deletions

...matrix/android/sdk/internal/wellknown/GetWellknownTask.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/WorkerParamsFactory.kt 1 addition, 1 deletion

...matrix/android/sdk/internal/worker/WorkerParamsFactory.kt
matrix-sdk-android/src/main/java/org/matrix/androidsdk/crypto/data/MXDeviceInfo.java 2 additions, 2 deletions

.../java/org/matrix/androidsdk/crypto/data/MXDeviceInfo.java
matrix-sdk-android/src/main/res/values-fr/strings_sas.xml 2 additions, 2 deletions

matrix-sdk-android/src/main/res/values-fr/strings_sas.xml
matrix-sdk-android/src/main/res/values-hu/strings_sas.xml 68 additions, 0 deletions

matrix-sdk-android/src/main/res/values-hu/strings_sas.xml
matrix-sdk-android/src/main/res/values-tzm/strings_sas.xml 30 additions, 0 deletions

matrix-sdk-android/src/main/res/values-tzm/strings_sas.xml
matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/room/send/WaveFormSanitizerTest.kt 123 additions, 0 deletions

...d/sdk/internal/session/room/send/WaveFormSanitizerTest.kt
tools/import_from_element.sh 1 addition, 1 deletion

tools/import_from_element.sh

with 328 additions and 55 deletions

Please register or to comment