Merge branch 'release/1.0.13'

CHANGES.md

 Please also refer to the Changelog of Element Android: https://github.com/vector-im/element-android/blob/master/CHANGES.md
 
+Changes in Matrix-SDK 1.0.13 (2020-12-21)
+===================================================
+
+Imported from Element 1.0.13. (https://github.com/vector-im/element-android/releases/tag/v1.0.13)
+
 Changes in Matrix-SDK 1.0.12 (2020-12-15)
 ===================================================
 
 Imported from Element 1.0.12. (https://github.com/vector-im/element-android/releases/tag/v1.0.12)
 
 SDK API changes ⚠️:
-S- StateService now exposes suspendable function instead of using MatrixCallback.
+ - StateService now exposes suspendable function instead of using MatrixCallback.
  - RawCacheStrategy has been moved and renamed to CacheStrategy
  - FileService: remove useless FileService.DownloadMode
 

matrix-sdk-android/build.gradle

@@ -25,7 +25,7 @@ android {
         minSdkVersion 21
         targetSdkVersion 29
         versionCode 1
-        versionName "1.0.12"
+        versionName "1.0.13"
         // Multidex is useful for tests
         multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/Constants.kt

@@ -33,5 +33,6 @@ const val REGISTER_FALLBACK_PATH = "/_matrix/static/client/register/"
  * Ref: https://matrix.org/docs/spec/client_server/latest#sso-client-login
  */
 const val SSO_REDIRECT_PATH = "/_matrix/client/r0/login/sso/redirect"
+const val MSC2858_SSO_REDIRECT_PATH = "/_matrix/client/unstable/org.matrix.msc2858/login/sso/redirect"
 
 const val SSO_REDIRECT_URL_PARAM = "redirectUrl"

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/LoginFlowResponse.kt

@@ -42,6 +42,6 @@ internal data class LoginFlow(
          * the client can show a button for each of the supported providers
          * See MSC #2858
          */
-        @Json(name = "identity_providers")
+        @Json(name = "org.matrix.msc2858.identity_providers")
         val ssoIdentityProvider: List<SsoIdentityProvider>?
 )

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)