From 8129cd0cd352a4908f4e49558e596888494e7a2d Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Tue, 2 Feb 2021 09:32:04 +0100
Subject: [PATCH] Cleaning + changelog

---
 CHANGES.md                                                  | 6 ++++--
 .../android/sdk/api/auth/UserInteractiveAuthInterceptor.kt  | 2 +-
 vector/src/main/AndroidManifest.xml                         | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 537e3aef7b..3d6c82a776 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -2,10 +2,12 @@ Changes in Element 1.0.15 (2020-XX-XX)
 ===================================================
 
 Features ✨:
- -
+ - Social Login support
 
 Improvements 🙌:
- -
+ - SSO support for cross signing (#1062)
+ - Deactivate account when logged in with SSO (#1264)
+ - SSO UIA doesn't work (#2754)
 
 Bugfix 🐛:
  - Fix clear cache issue: sometimes, after a clear cache, there is still a token, so the init sync service is not started.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/UserInteractiveAuthInterceptor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/UserInteractiveAuthInterceptor.kt
index 5c076b3f4b..e7f27f458c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/UserInteractiveAuthInterceptor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/UserInteractiveAuthInterceptor.kt
@@ -41,7 +41,7 @@ interface UserInteractiveAuthInterceptor {
     /**
      * When the API needs additional auth, this will be called.
      * Implementation should check the flows from flow response and act accordingly.
-     * Updated auth should be provider using promise.resume, this allow implementation to perform
+     * Updated auth should be provided using promise.resume, this allow implementation to perform
      * an async operation (prompt for user password, open sso fallback) and then resume initial API call when done.
      */
     fun performStage(flowResponse: RegistrationFlowResponse, errCode: String?, promise: Continuation<UIABaseAuth>)
diff --git a/vector/src/main/AndroidManifest.xml b/vector/src/main/AndroidManifest.xml
index 1028f200af..43ad1d3182 100644
--- a/vector/src/main/AndroidManifest.xml
+++ b/vector/src/main/AndroidManifest.xml
@@ -248,7 +248,7 @@
             android:exported="false">
 
             <!-- XXX: UIA SSO has only web fallback, i.e no url redirect, so for now we comment this out
-            hopefully, we would use it when finalyy available
+            hopefully, we would use it when finally available
             -->
             <!-- Add intent filter to handle redirection URL after SSO login in external browser -->
 <!--            <intent-filter>-->