From 930b8da3b3197c5aea78d66a1c82786ea4340d4b Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Fri, 18 Dec 2020 09:53:59 +0100 Subject: [PATCH 1/2] Typo in comment --- .../sdk/internal/session/identity/IdentityBulkLookupTask.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityBulkLookupTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityBulkLookupTask.kt index 3b0d514cf3..a03bef9501 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityBulkLookupTask.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityBulkLookupTask.kt @@ -93,7 +93,7 @@ internal class DefaultIdentityBulkLookupTask @Inject constructor( } catch (failure: Throwable) { // Catch invalid hash pepper and retry if (canRetry && failure is Failure.ServerError && failure.error.code == MatrixError.M_INVALID_PEPPER) { - // This is not documented, by the error can contain the new pepper! + // This is not documented, but the error can contain the new pepper! if (!failure.error.newLookupPepper.isNullOrEmpty()) { // Store it and use it right now hashDetailResponse.copy(pepper = failure.error.newLookupPepper) From d53650c8ae801c01730a1628f21aff977806fd28 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Fri, 18 Dec 2020 10:59:43 +0100 Subject: [PATCH 2/2] Prepare release 1.0.13 --- CHANGES.md | 23 +------------------ .../android/en-US/changelogs/40100130.txt | 2 ++ 2 files changed, 3 insertions(+), 22 deletions(-) create mode 100644 fastlane/metadata/android/en-US/changelogs/40100130.txt diff --git a/CHANGES.md b/CHANGES.md index f1e1061c49..8a7b82c77b 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,30 +1,9 @@ -Changes in Element 1.0.13 (2020-XX-XX) +Changes in Element 1.0.13 (2020-12-18) =================================================== -Features ✨: - - - -Improvements 🙌: - - - Bugfix 🐛: - Fix MSC2858 implementation details (#2540) -Translations 🗣: - - - -SDK API changes ⚠️: - - - -Build 🧱: - - - -Test: - - - -Other changes: - - - Changes in Element 1.0.12 (2020-12-15) =================================================== diff --git a/fastlane/metadata/android/en-US/changelogs/40100130.txt b/fastlane/metadata/android/en-US/changelogs/40100130.txt new file mode 100644 index 0000000000..39715c2910 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/40100130.txt @@ -0,0 +1,2 @@ +Main changes in this version: URL Preview, new Emoji keyboard, new room settings capabilities, and snow for Christmas! +Full changelog: https://github.com/vector-im/element-android/releases/tag/v1.0.12 \ No newline at end of file