Merge branch 'release/1.0.13' into develop

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)
 ===================================================
 

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

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)