From 23e05200b568cadffc1568fdbd070a1dc5c89adc Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 14 Dec 2020 14:10:04 +0100
Subject: [PATCH] Social login: cleanup

---
 CHANGES.md                                                | 1 +
 .../java/org/matrix/android/sdk/api/auth/Constants.kt     | 2 +-
 .../matrix/android/sdk/api/auth/data/IdentityProvider.kt  | 8 ++++----
 .../org/matrix/android/sdk/api/session/call/CallState.kt  | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 7bbeb0443d..78cea417aa 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -7,6 +7,7 @@ Features ✨:
  - Url preview (#481)
  - Store encrypted file in cache and cleanup decrypted file at each app start (#2512)
  - Emoji Keyboard (#2520)
+ - Social login (#2452)
 
 Improvements 🙌:
  - Add Setting Item to Change PIN (#2462)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/Constants.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/Constants.kt
index 6cacf55a38..871c2559f8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/Constants.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/Constants.kt
@@ -19,7 +19,7 @@ package org.matrix.android.sdk.api.auth
 /**
  * Path to use when the client does not supported any or all login flows
  * Ref: https://matrix.org/docs/spec/client_server/latest#login-fallback
- * */
+ */
 const val LOGIN_FALLBACK_PATH = "/_matrix/static/client/login/"
 
 /**
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/IdentityProvider.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/IdentityProvider.kt
index 22f7f85b97..8847e27a92 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/IdentityProvider.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/IdentityProvider.kt
@@ -31,12 +31,12 @@ data class IdentityProvider(
         @Json(name = "id") val id: String,
         /**
          * The name field should be the human readable string intended for printing by the client.
-         * */
+         */
         @Json(name = "name") val name: String?,
         /**
          * The icon field is the only optional field and should point to an icon representing the IdP.
-         *  If present then it must be an HTTPS URL to an image resource.
-         *  This should be hosted by the homeserver service provider to not leak the client's IP address unnecessarily.
+         * If present then it must be an HTTPS URL to an image resource.
+         * This should be hosted by the homeserver service provider to not leak the client's IP address unnecessarily.
          */
-        @Json(name = "icon") val icon: String?
+        @Json(name = "icon") val iconUrl: String?
 ) : Parcelable
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/CallState.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/CallState.kt
index e55546e12d..757a09fb3f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/CallState.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/CallState.kt
@@ -36,7 +36,7 @@ sealed class CallState {
      * Connected. Incoming/Outgoing call, ice layer connecting or connected
      * Notice that the PeerState failed is not always final, if you switch network, new ice candidtates
      * could be exchanged, and the connection could go back to connected
-     * */
+     */
     data class Connected(val iceConnectionState: PeerConnection.PeerConnectionState) : CallState()
 
     /** Terminated.  Incoming/Outgoing call, the call is terminated */