From d9009540ddb235084308f22fd4e59ed2d708ef77 Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onurays@element.io>
Date: Thu, 27 Aug 2020 16:43:11 +0300
Subject: [PATCH 01/47] Don't try to use bluetooth headset if it is not
 connected.

---
 CHANGES.md                                                    | 1 +
 .../main/java/im/vector/app/features/call/CallAudioManager.kt | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index c923053b24..07b50ef632 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -14,6 +14,7 @@ Bugfix 🐛:
  - Fix FontSize issue (#1483, #1787)
  - Fix bad color for settings icon on Android < 24 (#1786)
  - Change user or room avatar: when selecting Gallery, I'm not proposed to crop the selected image (#1590)
+ - Loudspeaker is always used (#1685)
 
 Translations 🗣:
  -
diff --git a/vector/src/main/java/im/vector/app/features/call/CallAudioManager.kt b/vector/src/main/java/im/vector/app/features/call/CallAudioManager.kt
index fde562ee63..2a773c2f9b 100644
--- a/vector/src/main/java/im/vector/app/features/call/CallAudioManager.kt
+++ b/vector/src/main/java/im/vector/app/features/call/CallAudioManager.kt
@@ -125,7 +125,7 @@ class CallAudioManager(
             } else {
                 // if a wired headset is plugged, sound will be directed to it
                 // (can't really force earpiece when headset is plugged)
-                if (isBluetoothHeadsetOn()) {
+                if (isBluetoothHeadsetConnected(audioManager)) {
                     Timber.v("##VOIP: AudioManager default to WIRELESS_HEADSET ")
                     setCurrentSoundDevice(SoundDevice.WIRELESS_HEADSET)
                     // try now in case already connected?
@@ -246,7 +246,7 @@ class CallAudioManager(
     }
 
     private fun isHeadsetOn(): Boolean {
-        return isWiredHeadsetOn() || isBluetoothHeadsetOn()
+        return isWiredHeadsetOn() || (audioManager?.let { isBluetoothHeadsetConnected(it) } ?: false)
     }
 
     private fun isWiredHeadsetOn(): Boolean {

From 66dfcbc2f8052e0df609ba58d4e53f698a7a977e Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 28 Aug 2020 10:11:38 +0200
Subject: [PATCH 02/47] Add documentation on the flows

---
 docs/add_email.md | 177 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 177 insertions(+)
 create mode 100644 docs/add_email.md

diff --git a/docs/add_email.md b/docs/add_email.md
new file mode 100644
index 0000000000..64227418a3
--- /dev/null
+++ b/docs/add_email.md
@@ -0,0 +1,177 @@
+# Adding an email to an account
+
+## User enter the email
+
+> POST https://homeserver.org/_matrix/client/r0/account/3pid/email/requestToken
+
+```json
+{
+  "email": "alice@email-provider.org",
+  "client_secret": "TixzvOnw7nLEUdiQEmkHzkXKrY4HhiGh",
+  "send_attempt": 1
+}
+```
+
+### The email is already adding to an account
+
+400
+
+```json
+{
+  "errcode": "M_THREEPID_IN_USE",
+  "error": "Email is already in use"
+}
+```
+
+### The email is free
+
+Wording: "We've sent you an email to verify your address. Please follow the instructions there and then click the button below."
+
+200
+
+```json
+{
+  "sid": "bxyDHuJKsdkjMlTJ"
+}
+```
+
+## User receive an e-mail
+
+> [homeserver.org] Validate your email
+>
+> A request to add an email address to your Matrix account has been received. If this was you, please click the link below to confirm adding this email:
+  https://homeserver.org/_matrix/client/unstable/add_threepid/email/submit_token?token=WUnEhQAmJrXupdEbXgdWvnVIKaGYZFsU&client_secret=TixzvOnw7nLEUdiQEmkHzkXKrY4HhiGh&sid=bxyDHuJKsdkjMlTJ
+>  
+>  If this was not you, you can safely ignore this email. Thank you.
+
+## User clicks on the link
+
+The browser displays the following message:
+
+> Your email has now been validated, please return to your client. You may now close this window.
+
+## User returns on Element
+
+User clicks on CONTINUE
+
+> POST https://homeserver.org/_matrix/client/r0/account/3pid/add
+
+```json
+{
+  "sid": "bxyDHuJKsdkjMlTJ",
+  "client_secret": "TixzvOnw7nLEUdiQEmkHzkXKrY4HhiGh"
+}
+```
+
+401 User Interactive Authentication
+
+```json
+{
+  "session": "ppvvnozXCQZFaggUBlHJYPjA",
+  "flows": [
+    {
+      "stages": [
+        "m.login.password"
+      ]
+    }
+  ],
+  "params": {
+  }
+}
+```
+
+## User enters his password
+
+POST https://homeserver.org/_matrix/client/r0/account/3pid/add
+
+```json
+{
+  "sid": "bxyDHuJKsdkjMlTJ",
+  "client_secret": "TixzvOnw7nLEUdiQEmkHzkXKrY4HhiGh",
+  "auth": {
+    "session": "ppvvnozXCQZFaggUBlHJYPjA",
+    "type": "m.login.password",
+    "user": "@benoitx:matrix.org",
+    "identifier": {
+      "type": "m.id.user",
+      "user": "@benoitx:matrix.org"
+    },
+    "password": "weak_password"
+  }
+}
+```
+
+### The link has not been clicked
+
+400
+
+```json
+{
+  "errcode": "M_THREEPID_AUTH_FAILED",
+  "error": "No validated 3pid session found"
+}
+```
+
+### Wrong password
+
+401
+
+```json
+{
+  "session": "fXHOvoQsPMhEebVqTnIrzZJN",
+  "flows": [
+    {
+      "stages": [
+        "m.login.password"
+      ]
+    }
+  ],
+  "params": {
+  },
+  "completed":[
+  ],
+  "error": "Invalid password",
+  "errcode": "M_FORBIDDEN"
+}
+```
+
+### The link has been clicked and the account password is correct
+
+200
+
+```json
+{}
+```
+
+# Remove email
+
+## User want to remove the email from his account
+
+> POST https://homeserver.org/_matrix/client/r0/account/3pid/delete
+
+```json
+{
+  "medium": "email",
+  "address": "alice@email-provider.org"
+}
+```
+
+### Email was not bound to an identity server
+
+200
+
+```json
+{
+  "id_server_unbind_result": "no-support"
+}
+```
+
+### Email was bound to an identity server
+
+200
+
+```json
+{
+  "id_server_unbind_result": "success"
+}
+```

From b11eced4f14b179ab0cacd7a4c3bfdf93b228fdb Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 28 Aug 2020 11:12:29 +0200
Subject: [PATCH 03/47] Fix a refresh problem on the user avatar

---
 .../app/core/preference/UserAvatarPreference.kt      | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/app/core/preference/UserAvatarPreference.kt b/vector/src/main/java/im/vector/app/core/preference/UserAvatarPreference.kt
index e3b4430fe0..3bb50c6284 100755
--- a/vector/src/main/java/im/vector/app/core/preference/UserAvatarPreference.kt
+++ b/vector/src/main/java/im/vector/app/core/preference/UserAvatarPreference.kt
@@ -26,6 +26,7 @@ import im.vector.app.R
 import im.vector.app.core.extensions.vectorComponent
 import im.vector.app.features.home.AvatarRenderer
 import org.matrix.android.sdk.api.session.user.model.User
+import org.matrix.android.sdk.api.util.MatrixItem
 import org.matrix.android.sdk.api.util.toMatrixItem
 
 class UserAvatarPreference : Preference {
@@ -34,6 +35,8 @@ class UserAvatarPreference : Preference {
 
     private var avatarRenderer: AvatarRenderer = context.vectorComponent().avatarRenderer()
 
+    private var userItem: MatrixItem.UserItem? = null
+
     constructor(context: Context) : super(context)
 
     constructor(context: Context, attrs: AttributeSet) : super(context, attrs)
@@ -50,9 +53,16 @@ class UserAvatarPreference : Preference {
         super.onBindViewHolder(holder)
         mAvatarView = holder.itemView.findViewById(R.id.settings_avatar)
         mLoadingProgressBar = holder.itemView.findViewById(R.id.avatar_update_progress_bar)
+        refreshUi()
     }
 
     fun refreshAvatar(user: User) {
-        mAvatarView?.let { avatarRenderer.render(user.toMatrixItem(), it) }
+        userItem = user.toMatrixItem()
+        refreshUi()
+    }
+
+    private fun refreshUi() {
+        val safeUserItem = userItem ?: return
+        mAvatarView?.let { avatarRenderer.render(safeUserItem, it) }
     }
 }

From 46d3608ccb5c705fea92f7f585cba8fce6d92cbc Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Fri, 28 Aug 2020 11:25:16 +0200
Subject: [PATCH 04/47] RiotX -> Element

---
 .../{RiotXFeature => ElementFeature}/globals.xml.ftl          | 0
 .../templates/{RiotXFeature => ElementFeature}/recipe.xml.ftl | 0
 .../root/res/layout/fragment.xml.ftl                          | 0
 .../root/src/app_package/Action.kt.ftl                        | 0
 .../root/src/app_package/Activity.kt.ftl                      | 0
 .../root/src/app_package/Fragment.kt.ftl                      | 0
 .../root/src/app_package/ViewEvents.kt.ftl                    | 0
 .../root/src/app_package/ViewModel.kt.ftl                     | 0
 .../root/src/app_package/ViewState.kt.ftl                     | 0
 tools/templates/{RiotXFeature => ElementFeature}/template.xml | 2 +-
 tools/templates/configure.sh                                  | 4 ++--
 11 files changed, 3 insertions(+), 3 deletions(-)
 rename tools/templates/{RiotXFeature => ElementFeature}/globals.xml.ftl (100%)
 rename tools/templates/{RiotXFeature => ElementFeature}/recipe.xml.ftl (100%)
 rename tools/templates/{RiotXFeature => ElementFeature}/root/res/layout/fragment.xml.ftl (100%)
 rename tools/templates/{RiotXFeature => ElementFeature}/root/src/app_package/Action.kt.ftl (100%)
 rename tools/templates/{RiotXFeature => ElementFeature}/root/src/app_package/Activity.kt.ftl (100%)
 rename tools/templates/{RiotXFeature => ElementFeature}/root/src/app_package/Fragment.kt.ftl (100%)
 rename tools/templates/{RiotXFeature => ElementFeature}/root/src/app_package/ViewEvents.kt.ftl (100%)
 rename tools/templates/{RiotXFeature => ElementFeature}/root/src/app_package/ViewModel.kt.ftl (100%)
 rename tools/templates/{RiotXFeature => ElementFeature}/root/src/app_package/ViewState.kt.ftl (100%)
 rename tools/templates/{RiotXFeature => ElementFeature}/template.xml (99%)

diff --git a/tools/templates/RiotXFeature/globals.xml.ftl b/tools/templates/ElementFeature/globals.xml.ftl
similarity index 100%
rename from tools/templates/RiotXFeature/globals.xml.ftl
rename to tools/templates/ElementFeature/globals.xml.ftl
diff --git a/tools/templates/RiotXFeature/recipe.xml.ftl b/tools/templates/ElementFeature/recipe.xml.ftl
similarity index 100%
rename from tools/templates/RiotXFeature/recipe.xml.ftl
rename to tools/templates/ElementFeature/recipe.xml.ftl
diff --git a/tools/templates/RiotXFeature/root/res/layout/fragment.xml.ftl b/tools/templates/ElementFeature/root/res/layout/fragment.xml.ftl
similarity index 100%
rename from tools/templates/RiotXFeature/root/res/layout/fragment.xml.ftl
rename to tools/templates/ElementFeature/root/res/layout/fragment.xml.ftl
diff --git a/tools/templates/RiotXFeature/root/src/app_package/Action.kt.ftl b/tools/templates/ElementFeature/root/src/app_package/Action.kt.ftl
similarity index 100%
rename from tools/templates/RiotXFeature/root/src/app_package/Action.kt.ftl
rename to tools/templates/ElementFeature/root/src/app_package/Action.kt.ftl
diff --git a/tools/templates/RiotXFeature/root/src/app_package/Activity.kt.ftl b/tools/templates/ElementFeature/root/src/app_package/Activity.kt.ftl
similarity index 100%
rename from tools/templates/RiotXFeature/root/src/app_package/Activity.kt.ftl
rename to tools/templates/ElementFeature/root/src/app_package/Activity.kt.ftl
diff --git a/tools/templates/RiotXFeature/root/src/app_package/Fragment.kt.ftl b/tools/templates/ElementFeature/root/src/app_package/Fragment.kt.ftl
similarity index 100%
rename from tools/templates/RiotXFeature/root/src/app_package/Fragment.kt.ftl
rename to tools/templates/ElementFeature/root/src/app_package/Fragment.kt.ftl
diff --git a/tools/templates/RiotXFeature/root/src/app_package/ViewEvents.kt.ftl b/tools/templates/ElementFeature/root/src/app_package/ViewEvents.kt.ftl
similarity index 100%
rename from tools/templates/RiotXFeature/root/src/app_package/ViewEvents.kt.ftl
rename to tools/templates/ElementFeature/root/src/app_package/ViewEvents.kt.ftl
diff --git a/tools/templates/RiotXFeature/root/src/app_package/ViewModel.kt.ftl b/tools/templates/ElementFeature/root/src/app_package/ViewModel.kt.ftl
similarity index 100%
rename from tools/templates/RiotXFeature/root/src/app_package/ViewModel.kt.ftl
rename to tools/templates/ElementFeature/root/src/app_package/ViewModel.kt.ftl
diff --git a/tools/templates/RiotXFeature/root/src/app_package/ViewState.kt.ftl b/tools/templates/ElementFeature/root/src/app_package/ViewState.kt.ftl
similarity index 100%
rename from tools/templates/RiotXFeature/root/src/app_package/ViewState.kt.ftl
rename to tools/templates/ElementFeature/root/src/app_package/ViewState.kt.ftl
diff --git a/tools/templates/RiotXFeature/template.xml b/tools/templates/ElementFeature/template.xml
similarity index 99%
rename from tools/templates/RiotXFeature/template.xml
rename to tools/templates/ElementFeature/template.xml
index 33d2edfc70..14c718c993 100644
--- a/tools/templates/RiotXFeature/template.xml
+++ b/tools/templates/ElementFeature/template.xml
@@ -2,7 +2,7 @@
 <template
     format="5"
     revision="1"
-    name="RiotX Feature"
+    name="Element Feature"
     minApi="19"
     minBuildApi="19"
     description="Creates a new activity and a fragment with view model, view state and actions">
diff --git a/tools/templates/configure.sh b/tools/templates/configure.sh
index de7fe7da81..0669ab1312 100755
--- a/tools/templates/configure.sh
+++ b/tools/templates/configure.sh
@@ -16,10 +16,10 @@
 # limitations under the License.
 #
 
-echo "Configure RiotX Template..."
+echo "Configure Element Template..."
 if [ -z ${ANDROID_STUDIO+x} ]; then ANDROID_STUDIO="/Applications/Android Studio.app/Contents"; fi
 {
-ln -s $(pwd)/RiotXFeature "${ANDROID_STUDIO%/}/plugins/android/lib/templates/other"
+ln -s $(pwd)/ElementFeature "${ANDROID_STUDIO%/}/plugins/android/lib/templates/other"
 } && {
   echo "Please restart Android Studio."
 }

From 175a5ab82447d5db77c4964ec660817ac44e2502 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 28 Aug 2020 16:45:09 +0200
Subject: [PATCH 05/47] List phone numbers and emails added to the Matrix
 account, and add Email to account (#44)

---
 CHANGES.md                                    |   2 +-
 docs/add_email.md                             |   4 +-
 .../org/matrix/android/sdk/rx/RxSession.kt    |  13 +-
 .../sdk/api/session/profile/ProfileService.kt |  28 ++
 .../database/RealmSessionStoreMigration.kt    |  15 +
 .../database/model/PendingThreePidEntity.kt   |  31 ++
 .../database/model/SessionRealmModule.kt      |   1 +
 .../internal/session/profile/AddEmailBody.kt  |  47 +++
 .../session/profile/AddThreePidResponse.kt    |  30 ++
 .../session/profile/AddThreePidTask.kt        |  70 ++++
 .../session/profile/DefaultProfileService.kt  |  72 +++-
 .../session/profile/DeleteThreePidBody.kt     |  32 ++
 .../session/profile/DeleteThreePidResponse.kt |  32 ++
 .../session/profile/DeleteThreePidTask.kt     |  48 +++
 .../profile/FinalizeAddThreePidBody.kt        |  42 +++
 .../profile/FinalizeAddingThreePidTask.kt     |  90 +++++
 .../session/profile/PendingThreePid.kt        |  27 ++
 .../session/profile/PendingThreePidMapper.kt  |  45 +++
 .../internal/session/profile/ProfileAPI.kt    |  19 +-
 .../internal/session/profile/ProfileModule.kt |   9 +
 .../im/vector/app/core/di/FragmentModule.kt   |   6 +
 .../vector/app/core/error/ErrorFormatter.kt   |  24 +-
 .../im/vector/app/core/ui/list/GenericItem.kt |   9 +
 .../settings/VectorSettingsGeneralFragment.kt | 339 ------------------
 .../settings/devices/DevicesViewModel.kt      |  12 +-
 .../threepids/ThreePidsSettingsAction.kt      |  27 ++
 .../threepids/ThreePidsSettingsController.kt  | 145 ++++++++
 .../threepids/ThreePidsSettingsFragment.kt    | 138 +++++++
 .../threepids/ThreePidsSettingsViewEvents.kt  |  24 ++
 .../threepids/ThreePidsSettingsViewModel.kt   | 168 +++++++++
 .../threepids/ThreePidsSettingsViewState.kt   |  28 ++
 .../src/main/res/layout/item_generic_list.xml |  20 +-
 vector/src/main/res/values/strings.xml        |   6 +
 .../main/res/xml/vector_settings_general.xml  |  30 +-
 34 files changed, 1240 insertions(+), 393 deletions(-)
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PendingThreePidEntity.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddEmailBody.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddThreePidResponse.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddThreePidTask.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DeleteThreePidBody.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DeleteThreePidResponse.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DeleteThreePidTask.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/FinalizeAddThreePidBody.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/FinalizeAddingThreePidTask.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/PendingThreePid.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/PendingThreePidMapper.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsAction.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsController.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsFragment.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewEvents.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewModel.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewState.kt

diff --git a/CHANGES.md b/CHANGES.md
index 1ffb6bcad0..b96337097b 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -2,7 +2,7 @@ Changes in Element 1.0.6 (2020-XX-XX)
 ===================================================
 
 Features ✨:
- -
+ - List phone numbers and emails added to the Matrix account, and add Email to account (#44)
 
 Improvements 🙌:
  - You can now join room through permalink and within room directory search
diff --git a/docs/add_email.md b/docs/add_email.md
index 64227418a3..06b01b3026 100644
--- a/docs/add_email.md
+++ b/docs/add_email.md
@@ -12,7 +12,7 @@
 }
 ```
 
-### The email is already adding to an account
+### The email is already added to an account
 
 400
 
@@ -84,6 +84,8 @@ User clicks on CONTINUE
 
 POST https://homeserver.org/_matrix/client/r0/account/3pid/add
 
+TODO: Remove "identifier"?
+
 ```json
 {
   "sid": "bxyDHuJKsdkjMlTJ",
diff --git a/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxSession.kt b/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxSession.kt
index 45efd125ee..55ede52c0c 100644
--- a/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxSession.kt
+++ b/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxSession.kt
@@ -18,9 +18,13 @@
 package org.matrix.android.sdk.rx
 
 import androidx.paging.PagedList
+import io.reactivex.Observable
+import io.reactivex.Single
+import io.reactivex.functions.Function3
 import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.query.QueryStringValue
 import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.accountdata.UserAccountDataEvent
 import org.matrix.android.sdk.api.session.crypto.crosssigning.KEYBACKUP_SECRET_SSSS_NAME
 import org.matrix.android.sdk.api.session.crypto.crosssigning.MASTER_KEY_SSSS_NAME
 import org.matrix.android.sdk.api.session.crypto.crosssigning.MXCrossSigningInfo
@@ -43,10 +47,6 @@ import org.matrix.android.sdk.api.util.toOptional
 import org.matrix.android.sdk.internal.crypto.model.CryptoDeviceInfo
 import org.matrix.android.sdk.internal.crypto.model.rest.DeviceInfo
 import org.matrix.android.sdk.internal.crypto.store.PrivateKeysInfo
-import org.matrix.android.sdk.api.session.accountdata.UserAccountDataEvent
-import io.reactivex.Observable
-import io.reactivex.Single
-import io.reactivex.functions.Function3
 
 class RxSession(private val session: Session) {
 
@@ -110,6 +110,11 @@ class RxSession(private val session: Session) {
                 .startWithCallable { session.getThreePids() }
     }
 
+    fun livePendingThreePIds(): Observable<List<ThreePid>> {
+        return session.getPendingThreePidsLive().asObservable()
+                .startWithCallable { session.getPendingThreePids() }
+    }
+
     fun createRoom(roomParams: CreateRoomParams): Single<String> = singleBuilder {
         session.createRoom(roomParams, it)
     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/profile/ProfileService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/profile/ProfileService.kt
index 449c670983..95f142e877 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/profile/ProfileService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/profile/ProfileService.kt
@@ -83,4 +83,32 @@ interface ProfileService {
      * @param refreshData set to true to fetch data from the homeserver
      */
     fun getThreePidsLive(refreshData: Boolean): LiveData<List<ThreePid>>
+
+    /**
+     * Get the pending 3Pids, i.e. ThreePids that have requested a token, but not yet validated by the user.
+     */
+    fun getPendingThreePids(): List<ThreePid>
+
+    /**
+     * Get the pending 3Pids Live
+     */
+    fun getPendingThreePidsLive(): LiveData<List<ThreePid>>
+
+    /**
+     * Add a 3Pids. This is the first step to add a ThreePid to an account. Then the threePid will be added to the pending threePid list.
+     */
+    fun addThreePid(threePid: ThreePid, matrixCallback: MatrixCallback<Unit>): Cancelable
+
+    /**
+     * Finalize adding a 3Pids. Call this method once the user has validated that he owns the ThreePid
+     */
+    fun finalizeAddingThreePid(threePid: ThreePid,
+                               uiaSession: String?,
+                               accountPassword: String?,
+                               matrixCallback: MatrixCallback<Unit>): Cancelable
+
+    /**
+     * Delete a 3Pids.
+     */
+    fun deleteThreePid(threePid: ThreePid, matrixCallback: MatrixCallback<Unit>): Cancelable
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
index 7d2a4ea581..00c4fdac84 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
@@ -20,6 +20,7 @@ package org.matrix.android.sdk.internal.database
 import io.realm.DynamicRealm
 import io.realm.RealmMigration
 import org.matrix.android.sdk.internal.database.model.HomeServerCapabilitiesEntityFields
+import org.matrix.android.sdk.internal.database.model.PendingThreePidEntityFields
 import org.matrix.android.sdk.internal.database.model.RoomSummaryEntityFields
 import timber.log.Timber
 import javax.inject.Inject
@@ -32,6 +33,7 @@ class RealmSessionStoreMigration @Inject constructor() : RealmMigration {
         if (oldVersion <= 0) migrateTo1(realm)
         if (oldVersion <= 1) migrateTo2(realm)
         if (oldVersion <= 2) migrateTo3(realm)
+        if (oldVersion <= 3) migrateTo4(realm)
     }
 
     private fun migrateTo1(realm: DynamicRealm) {
@@ -63,4 +65,17 @@ class RealmSessionStoreMigration @Inject constructor() : RealmMigration {
                     obj.setLong(HomeServerCapabilitiesEntityFields.LAST_UPDATED_TIMESTAMP, 0)
                 }
     }
+
+    private fun migrateTo4(realm: DynamicRealm) {
+        Timber.d("Step 3 -> 4")
+        realm.schema.create("PendingThreePidEntity")
+                .addField(PendingThreePidEntityFields.CLIENT_SECRET, String::class.java)
+                .setRequired(PendingThreePidEntityFields.CLIENT_SECRET, true)
+                .addField(PendingThreePidEntityFields.EMAIL, String::class.java)
+                .addField(PendingThreePidEntityFields.MSISDN, String::class.java)
+                .addField(PendingThreePidEntityFields.SEND_ATTEMPT, Int::class.java)
+                .setRequired(PendingThreePidEntityFields.SEND_ATTEMPT, true)
+                .addField(PendingThreePidEntityFields.SID, String::class.java)
+                .setRequired(PendingThreePidEntityFields.SID, true)
+    }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PendingThreePidEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PendingThreePidEntity.kt
new file mode 100644
index 0000000000..bf2f11dedd
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PendingThreePidEntity.kt
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.database.model
+
+import io.realm.RealmObject
+
+/**
+ * This class is used to store pending threePid data, when user wants to add a threePid to his account
+ */
+internal open class PendingThreePidEntity(
+        var email: String? = null,
+        var msisdn: String? = null,
+        var clientSecret: String = "",
+        var sendAttempt: Int = 0,
+        var sid: String = ""
+) : RealmObject()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SessionRealmModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SessionRealmModule.kt
index ea466db352..2c45cfcdbf 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SessionRealmModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SessionRealmModule.kt
@@ -36,6 +36,7 @@ import io.realm.annotations.RealmModule
             RoomSummaryEntity::class,
             RoomTagEntity::class,
             SyncEntity::class,
+            PendingThreePidEntity::class,
             UserEntity::class,
             IgnoredUserEntity::class,
             BreadcrumbsEntity::class,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddEmailBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddEmailBody.kt
new file mode 100644
index 0000000000..ff81ad6a5c
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddEmailBody.kt
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.matrix.android.sdk.internal.session.profile
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+internal data class AddEmailBody(
+        /**
+         * Required. A unique string generated by the client, and used to identify the validation attempt.
+         * It must be a string consisting of the characters [0-9a-zA-Z.=_-]. Its length must not exceed
+         * 255 characters and it must not be empty.
+         */
+        @Json(name = "client_secret")
+        val clientSecret: String,
+
+        /**
+         * Required. The email address to validate.
+         */
+        @Json(name = "email")
+        val email: String,
+
+        /**
+         * Required. The server will only send an email if the send_attempt is a number greater than the most
+         * recent one which it has seen, scoped to that email + client_secret pair. This is to avoid repeatedly
+         * sending the same email in the case of request retries between the POSTing user and the identity server.
+         * The client should increment this value if they desire a new email (e.g. a reminder) to be sent.
+         * If they do not, the server should respond with success but not resend the email.
+         */
+        @Json(name = "send_attempt")
+        val sendAttempt: Int
+)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddThreePidResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddThreePidResponse.kt
new file mode 100644
index 0000000000..109b3d5343
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddThreePidResponse.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.matrix.android.sdk.internal.session.profile
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+internal data class AddThreePidResponse(
+        /**
+         * Required. The session ID. Session IDs are opaque strings that must consist entirely
+         * of the characters [0-9a-zA-Z.=_-]. Their length must not exceed 255 characters and they must not be empty.
+         */
+        @Json(name = "sid")
+        val sid: String
+)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddThreePidTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddThreePidTask.kt
new file mode 100644
index 0000000000..75c829c785
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddThreePidTask.kt
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.profile
+
+import com.zhuinden.monarchy.Monarchy
+import org.greenrobot.eventbus.EventBus
+import org.matrix.android.sdk.api.session.identity.ThreePid
+import org.matrix.android.sdk.internal.di.SessionDatabase
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.task.Task
+import org.matrix.android.sdk.internal.util.awaitTransaction
+import java.util.UUID
+import javax.inject.Inject
+
+internal abstract class AddThreePidTask : Task<AddThreePidTask.Params, Unit> {
+    data class Params(
+            val threePid: ThreePid
+    )
+}
+
+internal class DefaultAddThreePidTask @Inject constructor(
+        private val profileAPI: ProfileAPI,
+        @SessionDatabase private val monarchy: Monarchy,
+        private val pendingThreePidMapper: PendingThreePidMapper,
+        private val eventBus: EventBus) : AddThreePidTask() {
+
+    override suspend fun execute(params: Params) {
+        val clientSecret = UUID.randomUUID().toString()
+        val sendAttempt = 1
+        val result = when (params.threePid) {
+            is ThreePid.Email ->
+                executeRequest<AddThreePidResponse>(eventBus) {
+                    val body = AddEmailBody(
+                            email = params.threePid.email,
+                            sendAttempt = sendAttempt,
+                            clientSecret = clientSecret
+                    )
+                    apiCall = profileAPI.addEmail(body)
+                }
+            is ThreePid.Msisdn -> TODO()
+        }
+
+        // Store as a pending three pid
+        monarchy.awaitTransaction { realm ->
+            PendingThreePid(
+                    threePid = params.threePid,
+                    clientSecret = clientSecret,
+                    sendAttempt = sendAttempt,
+                    sid = result.sid
+            )
+                    .let { pendingThreePidMapper.map(it) }
+                    .let { realm.copyToRealm(it) }
+        }
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DefaultProfileService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DefaultProfileService.kt
index 633b047994..cd81496814 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DefaultProfileService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DefaultProfileService.kt
@@ -28,6 +28,7 @@ import org.matrix.android.sdk.api.session.profile.ProfileService
 import org.matrix.android.sdk.api.util.Cancelable
 import org.matrix.android.sdk.api.util.JsonDict
 import org.matrix.android.sdk.api.util.Optional
+import org.matrix.android.sdk.internal.database.model.PendingThreePidEntity
 import org.matrix.android.sdk.internal.database.model.UserThreePidEntity
 import org.matrix.android.sdk.internal.di.SessionDatabase
 import org.matrix.android.sdk.internal.session.content.FileUploader
@@ -44,6 +45,10 @@ internal class DefaultProfileService @Inject constructor(private val taskExecuto
                                                          private val getProfileInfoTask: GetProfileInfoTask,
                                                          private val setDisplayNameTask: SetDisplayNameTask,
                                                          private val setAvatarUrlTask: SetAvatarUrlTask,
+                                                         private val addThreePidTask: AddThreePidTask,
+                                                         private val finalizeAddingThreePidTask: FinalizeAddingThreePidTask,
+                                                         private val deleteThreePidTask: DeleteThreePidTask,
+                                                         private val pendingThreePidMapper: PendingThreePidMapper,
                                                          private val fileUploader: FileUploader) : ProfileService {
 
     override fun getDisplayName(userId: String, matrixCallback: MatrixCallback<Optional<String>>): Cancelable {
@@ -116,9 +121,7 @@ internal class DefaultProfileService @Inject constructor(private val taskExecuto
     override fun getThreePidsLive(refreshData: Boolean): LiveData<List<ThreePid>> {
         if (refreshData) {
             // Force a refresh of the values
-            refreshUserThreePidsTask
-                    .configureWith()
-                    .executeBy(taskExecutor)
+            refreshThreePids()
         }
 
         return monarchy.findAllMappedWithChanges(
@@ -126,6 +129,69 @@ internal class DefaultProfileService @Inject constructor(private val taskExecuto
                 { it.asDomain() }
         )
     }
+
+    private fun refreshThreePids() {
+        refreshUserThreePidsTask
+                .configureWith()
+                .executeBy(taskExecutor)
+    }
+
+    override fun getPendingThreePids(): List<ThreePid> {
+        return monarchy.fetchAllMappedSync(
+                { it.where<PendingThreePidEntity>() },
+                { pendingThreePidMapper.map(it).threePid }
+        )
+    }
+
+    override fun getPendingThreePidsLive(): LiveData<List<ThreePid>> {
+        return monarchy.findAllMappedWithChanges(
+                { it.where<PendingThreePidEntity>() },
+                { pendingThreePidMapper.map(it).threePid }
+        )
+    }
+
+    override fun addThreePid(threePid: ThreePid, matrixCallback: MatrixCallback<Unit>): Cancelable {
+        return addThreePidTask
+                .configureWith(AddThreePidTask.Params(threePid)) {
+                    callback = matrixCallback
+                }
+                .executeBy(taskExecutor)
+    }
+
+    override fun finalizeAddingThreePid(threePid: ThreePid,
+                                        uiaSession: String?,
+                                        accountPassword: String?,
+                                        matrixCallback: MatrixCallback<Unit>): Cancelable {
+        return finalizeAddingThreePidTask
+                .configureWith(FinalizeAddingThreePidTask.Params(threePid, uiaSession, accountPassword)) {
+                    callback = alsoRefresh(matrixCallback)
+                }
+                .executeBy(taskExecutor)
+    }
+
+    /**
+     * Wrap the callback to fetch 3Pids from the server in case of success
+     */
+    private fun alsoRefresh(callback: MatrixCallback<Unit>): MatrixCallback<Unit> {
+        return object : MatrixCallback<Unit> {
+            override fun onFailure(failure: Throwable) {
+                callback.onFailure(failure)
+            }
+
+            override fun onSuccess(data: Unit) {
+                refreshThreePids()
+                callback.onSuccess(data)
+            }
+        }
+    }
+
+    override fun deleteThreePid(threePid: ThreePid, matrixCallback: MatrixCallback<Unit>): Cancelable {
+        return deleteThreePidTask
+                .configureWith(DeleteThreePidTask.Params(threePid)) {
+                    callback = alsoRefresh(matrixCallback)
+                }
+                .executeBy(taskExecutor)
+    }
 }
 
 private fun UserThreePidEntity.asDomain(): ThreePid {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DeleteThreePidBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DeleteThreePidBody.kt
new file mode 100644
index 0000000000..e7d4568f8b
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DeleteThreePidBody.kt
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.matrix.android.sdk.internal.session.profile
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+internal data class DeleteThreePidBody(
+        /**
+         * Required. The medium of the third party identifier being removed. One of: ["email", "msisdn"]
+         */
+        @Json(name = "medium") val medium: String,
+        /**
+         * Required. The third party address being removed.
+         */
+        @Json(name = "address") val address: String
+)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DeleteThreePidResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DeleteThreePidResponse.kt
new file mode 100644
index 0000000000..3817277a9d
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DeleteThreePidResponse.kt
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.matrix.android.sdk.internal.session.profile
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+internal data class DeleteThreePidResponse(
+        /**
+         * Required. An indicator as to whether or not the homeserver was able to unbind the 3PID from
+         * the identity server. success indicates that the identity server has unbound the identifier
+         * whereas no-support indicates that the identity server refuses to support the request or the
+         * homeserver was not able to determine an identity server to unbind from. One of: ["no-support", "success"]
+         */
+        @Json(name = "id_server_unbind_result")
+        val idServerUnbindResult: String? = null
+)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DeleteThreePidTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DeleteThreePidTask.kt
new file mode 100644
index 0000000000..69ff7d82da
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DeleteThreePidTask.kt
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.profile
+
+import org.greenrobot.eventbus.EventBus
+import org.matrix.android.sdk.api.session.identity.ThreePid
+import org.matrix.android.sdk.api.session.identity.toMedium
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.task.Task
+import javax.inject.Inject
+
+internal abstract class DeleteThreePidTask : Task<DeleteThreePidTask.Params, Unit> {
+    data class Params(
+            val threePid: ThreePid
+    )
+}
+
+internal class DefaultDeleteThreePidTask @Inject constructor(
+        private val profileAPI: ProfileAPI,
+        private val eventBus: EventBus) : DeleteThreePidTask() {
+
+    override suspend fun execute(params: Params) {
+        executeRequest<DeleteThreePidResponse>(eventBus) {
+            val body = DeleteThreePidBody(
+                    medium = params.threePid.toMedium(),
+                    address = params.threePid.value
+            )
+            apiCall = profileAPI.deleteThreePid(body)
+        }
+
+        // We do not really care about the result for the moment
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/FinalizeAddThreePidBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/FinalizeAddThreePidBody.kt
new file mode 100644
index 0000000000..73e9b39cea
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/FinalizeAddThreePidBody.kt
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.matrix.android.sdk.internal.session.profile
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+import org.matrix.android.sdk.internal.crypto.model.rest.UserPasswordAuth
+
+@JsonClass(generateAdapter = true)
+internal data class FinalizeAddThreePidBody(
+        /**
+         * Required. The client secret used in the session with the homeserver.
+         */
+        @Json(name = "client_secret")
+        val clientSecret: String,
+
+        /**
+         * Required. The session identifier given by the homeserver.
+         */
+        @Json(name = "sid")
+        val sid: String,
+
+        /**
+         * Additional authentication information for the user-interactive authentication API.
+         */
+        @Json(name = "auth")
+        val auth: UserPasswordAuth?
+)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/FinalizeAddingThreePidTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/FinalizeAddingThreePidTask.kt
new file mode 100644
index 0000000000..e6f4141ab1
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/FinalizeAddingThreePidTask.kt
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.profile
+
+import com.zhuinden.monarchy.Monarchy
+import org.greenrobot.eventbus.EventBus
+import org.matrix.android.sdk.api.failure.Failure
+import org.matrix.android.sdk.api.failure.toRegistrationFlowResponse
+import org.matrix.android.sdk.api.session.identity.ThreePid
+import org.matrix.android.sdk.internal.crypto.model.rest.UserPasswordAuth
+import org.matrix.android.sdk.internal.database.model.PendingThreePidEntity
+import org.matrix.android.sdk.internal.database.model.PendingThreePidEntityFields
+import org.matrix.android.sdk.internal.di.SessionDatabase
+import org.matrix.android.sdk.internal.di.UserId
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.task.Task
+import org.matrix.android.sdk.internal.util.awaitTransaction
+import javax.inject.Inject
+
+internal abstract class FinalizeAddingThreePidTask : Task<FinalizeAddingThreePidTask.Params, Unit> {
+    data class Params(
+            val threePid: ThreePid,
+            val session: String?,
+            val accountPassword: String?
+    )
+}
+
+internal class DefaultFinalizeAddingThreePidTask @Inject constructor(
+        private val profileAPI: ProfileAPI,
+        @SessionDatabase private val monarchy: Monarchy,
+        private val pendingThreePidMapper: PendingThreePidMapper,
+        @UserId private val userId: String,
+        private val eventBus: EventBus) : FinalizeAddingThreePidTask() {
+
+    override suspend fun execute(params: Params) {
+        // Get the required pending data
+        val pendingThreePids = monarchy.fetchAllMappedSync(
+                { it.where(PendingThreePidEntity::class.java) },
+                { pendingThreePidMapper.map(it) }
+        )
+                .firstOrNull { it.threePid == params.threePid }
+                ?: throw IllegalArgumentException("unknown threepid")
+
+        try {
+            executeRequest<Unit>(eventBus) {
+                val body = FinalizeAddThreePidBody(
+                        clientSecret = pendingThreePids.clientSecret,
+                        sid = pendingThreePids.sid,
+                        auth = if (params.session != null && params.accountPassword != null) {
+                            UserPasswordAuth(
+                                    session = params.session,
+                                    user = userId,
+                                    password = params.accountPassword
+                            )
+                        } else null
+                )
+                apiCall = profileAPI.finalizeAddThreePid(body)
+            }
+        } catch (throwable: Throwable) {
+            throw throwable.toRegistrationFlowResponse()
+                    ?.let { Failure.RegistrationFlowError(it) }
+                    ?: throwable
+        }
+
+        // Delete the pending three pid
+        monarchy.awaitTransaction { realm ->
+            realm.where(PendingThreePidEntity::class.java)
+                    .equalTo(PendingThreePidEntityFields.EMAIL, params.threePid.value)
+                    .or()
+                    .equalTo(PendingThreePidEntityFields.MSISDN, params.threePid.value)
+                    .findAll()
+                    .deleteAllFromRealm()
+        }
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/PendingThreePid.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/PendingThreePid.kt
new file mode 100644
index 0000000000..d9c3a5d656
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/PendingThreePid.kt
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.profile
+
+import org.matrix.android.sdk.api.session.identity.ThreePid
+
+internal data class PendingThreePid(
+        val threePid: ThreePid,
+        val clientSecret: String,
+        val sendAttempt: Int,
+        val sid: String
+)
+
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/PendingThreePidMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/PendingThreePidMapper.kt
new file mode 100644
index 0000000000..c9d6381bd3
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/PendingThreePidMapper.kt
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.profile
+
+import org.matrix.android.sdk.api.session.identity.ThreePid
+import org.matrix.android.sdk.internal.database.model.PendingThreePidEntity
+import javax.inject.Inject
+
+internal class PendingThreePidMapper @Inject constructor() {
+
+    fun map(entity: PendingThreePidEntity): PendingThreePid {
+        return PendingThreePid(
+                threePid = entity.email?.let { ThreePid.Email(it) }
+                        ?: entity.msisdn?.let { ThreePid.Msisdn(it) }
+                        ?: error("Invalid data"),
+                clientSecret = entity.clientSecret,
+                sendAttempt = entity.sendAttempt,
+                sid = entity.sid
+        )
+    }
+
+    fun map(domain: PendingThreePid): PendingThreePidEntity {
+        return PendingThreePidEntity(
+                email = domain.threePid.takeIf { it is ThreePid.Email }?.value,
+                msisdn = domain.threePid.takeIf { it is ThreePid.Msisdn }?.value,
+                clientSecret = domain.clientSecret,
+                sendAttempt = domain.sendAttempt,
+                sid = domain.sid
+        )
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ProfileAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ProfileAPI.kt
index 31e1f09bbd..125b1a47e6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ProfileAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ProfileAPI.kt
@@ -28,7 +28,6 @@ import retrofit2.http.PUT
 import retrofit2.http.Path
 
 internal interface ProfileAPI {
-
     /**
      * Get the combined profile information for this user.
      * This API may be used to fetch the user's own profile information or other users; either locally or on remote homeservers.
@@ -71,4 +70,22 @@ internal interface ProfileAPI {
      */
     @POST(NetworkConstants.URI_API_PREFIX_PATH_UNSTABLE + "account/3pid/unbind")
     fun unbindThreePid(@Body body: UnbindThreePidBody): Call<UnbindThreePidResponse>
+
+    /**
+     * Ref: https://matrix.org/docs/spec/client_server/r0.6.1#post-matrix-client-r0-account-3pid-email-requesttoken
+     */
+    @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "account/3pid/email/requestToken")
+    fun addEmail(@Body body: AddEmailBody): Call<AddThreePidResponse>
+
+    /**
+     * Ref: https://matrix.org/docs/spec/client_server/r0.6.1#post-matrix-client-r0-account-3pid-add
+     */
+    @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "account/3pid/add")
+    fun finalizeAddThreePid(@Body body: FinalizeAddThreePidBody): Call<Unit>
+
+    /**
+     * Ref: https://matrix.org/docs/spec/client_server/r0.6.1#post-matrix-client-r0-account-3pid-delete
+     */
+    @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "account/3pid/delete")
+    fun deleteThreePid(@Body body: DeleteThreePidBody): Call<DeleteThreePidResponse>
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ProfileModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ProfileModule.kt
index 57a86d03e0..baeaf9fd58 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ProfileModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ProfileModule.kt
@@ -58,4 +58,13 @@ internal abstract class ProfileModule {
 
     @Binds
     abstract fun bindSetAvatarUrlTask(task: DefaultSetAvatarUrlTask): SetAvatarUrlTask
+
+    @Binds
+    abstract fun bindAddThreePidTask(task: DefaultAddThreePidTask): AddThreePidTask
+
+    @Binds
+    abstract fun bindFinalizeAddingThreePidTask(task: DefaultFinalizeAddingThreePidTask): FinalizeAddingThreePidTask
+
+    @Binds
+    abstract fun bindDeleteThreePidTask(task: DefaultDeleteThreePidTask): DeleteThreePidTask
 }
diff --git a/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt b/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
index 591d1c0474..d0e4c938cd 100644
--- a/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
+++ b/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
@@ -103,6 +103,7 @@ import im.vector.app.features.settings.ignored.VectorSettingsIgnoredUsersFragmen
 import im.vector.app.features.settings.locale.LocalePickerFragment
 import im.vector.app.features.settings.push.PushGatewaysFragment
 import im.vector.app.features.settings.push.PushRulesFragment
+import im.vector.app.features.settings.threepids.ThreePidsSettingsFragment
 import im.vector.app.features.share.IncomingShareFragment
 import im.vector.app.features.signout.soft.SoftLogoutFragment
 import im.vector.app.features.terms.ReviewTermsFragment
@@ -313,6 +314,11 @@ interface FragmentModule {
     @FragmentKey(VectorSettingsDevicesFragment::class)
     fun bindVectorSettingsDevicesFragment(fragment: VectorSettingsDevicesFragment): Fragment
 
+    @Binds
+    @IntoMap
+    @FragmentKey(ThreePidsSettingsFragment::class)
+    fun bindThreePidsSettingsFragment(fragment: ThreePidsSettingsFragment): Fragment
+
     @Binds
     @IntoMap
     @FragmentKey(PublicRoomsFragment::class)
diff --git a/vector/src/main/java/im/vector/app/core/error/ErrorFormatter.kt b/vector/src/main/java/im/vector/app/core/error/ErrorFormatter.kt
index 051847321a..14939eaff9 100644
--- a/vector/src/main/java/im/vector/app/core/error/ErrorFormatter.kt
+++ b/vector/src/main/java/im/vector/app/core/error/ErrorFormatter.kt
@@ -59,35 +59,39 @@ class DefaultErrorFormatter @Inject constructor(
             }
             is Failure.ServerError       -> {
                 when {
-                    throwable.error.code == MatrixError.M_CONSENT_NOT_GIVEN  -> {
+                    throwable.error.code == MatrixError.M_CONSENT_NOT_GIVEN         -> {
                         // Special case for terms and conditions
                         stringProvider.getString(R.string.error_terms_not_accepted)
                     }
-                    throwable.isInvalidPassword()                            -> {
+                    throwable.isInvalidPassword()                                   -> {
                         stringProvider.getString(R.string.auth_invalid_login_param)
                     }
-                    throwable.error.code == MatrixError.M_USER_IN_USE        -> {
+                    throwable.error.code == MatrixError.M_USER_IN_USE               -> {
                         stringProvider.getString(R.string.login_signup_error_user_in_use)
                     }
-                    throwable.error.code == MatrixError.M_BAD_JSON           -> {
+                    throwable.error.code == MatrixError.M_BAD_JSON                  -> {
                         stringProvider.getString(R.string.login_error_bad_json)
                     }
-                    throwable.error.code == MatrixError.M_NOT_JSON           -> {
+                    throwable.error.code == MatrixError.M_NOT_JSON                  -> {
                         stringProvider.getString(R.string.login_error_not_json)
                     }
-                    throwable.error.code == MatrixError.M_THREEPID_DENIED    -> {
+                    throwable.error.code == MatrixError.M_THREEPID_DENIED           -> {
                         stringProvider.getString(R.string.login_error_threepid_denied)
                     }
-                    throwable.error.code == MatrixError.M_LIMIT_EXCEEDED     -> {
+                    throwable.error.code == MatrixError.M_LIMIT_EXCEEDED            -> {
                         limitExceededError(throwable.error)
                     }
-                    throwable.error.code == MatrixError.M_THREEPID_NOT_FOUND -> {
+                    throwable.error.code == MatrixError.M_THREEPID_NOT_FOUND        -> {
                         stringProvider.getString(R.string.login_reset_password_error_not_found)
                     }
-                    throwable.error.code == MatrixError.M_USER_DEACTIVATED   -> {
+                    throwable.error.code == MatrixError.M_USER_DEACTIVATED          -> {
                         stringProvider.getString(R.string.auth_invalid_login_deactivated_account)
                     }
-                    else                                                     -> {
+                    throwable.error.code == MatrixError.M_THREEPID_IN_USE
+                            && throwable.error.message == "Email is already in use" -> {
+                        stringProvider.getString(R.string.account_email_already_used_error)
+                    }
+                    else                                                            -> {
                         throwable.error.message.takeIf { it.isNotEmpty() }
                                 ?: throwable.error.code.takeIf { it.isNotEmpty() }
                     }
diff --git a/vector/src/main/java/im/vector/app/core/ui/list/GenericItem.kt b/vector/src/main/java/im/vector/app/core/ui/list/GenericItem.kt
index 832250fab4..492df9eb00 100644
--- a/vector/src/main/java/im/vector/app/core/ui/list/GenericItem.kt
+++ b/vector/src/main/java/im/vector/app/core/ui/list/GenericItem.kt
@@ -70,6 +70,9 @@ abstract class GenericItem : VectorEpoxyModel<GenericItem.Holder>() {
     @EpoxyAttribute
     var buttonAction: Action? = null
 
+    @EpoxyAttribute
+    var destructiveButtonAction: Action? = null
+
     @EpoxyAttribute
     var itemClickAction: Action? = null
 
@@ -109,6 +112,11 @@ abstract class GenericItem : VectorEpoxyModel<GenericItem.Holder>() {
             buttonAction?.perform?.run()
         }
 
+        holder.destructiveButton.setTextOrHide(destructiveButtonAction?.title)
+        holder.destructiveButton.setOnClickListener {
+            destructiveButtonAction?.perform?.run()
+        }
+
         holder.root.setOnClickListener {
             itemClickAction?.perform?.run()
         }
@@ -122,5 +130,6 @@ abstract class GenericItem : VectorEpoxyModel<GenericItem.Holder>() {
         val accessoryImage by bind<ImageView>(R.id.item_generic_accessory_image)
         val progressBar by bind<ProgressBar>(R.id.item_generic_progress_bar)
         val actionButton by bind<Button>(R.id.item_generic_action_button)
+        val destructiveButton by bind<Button>(R.id.item_generic_destructive_action_button)
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt
index e31b81b162..c4df3a8d6e 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt
@@ -23,13 +23,11 @@ import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
 import android.text.Editable
-import android.util.Patterns
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
-import androidx.core.content.ContextCompat
 import androidx.core.net.toUri
 import androidx.core.view.isVisible
 import androidx.preference.EditTextPreference
@@ -54,13 +52,11 @@ import im.vector.app.core.utils.PERMISSION_REQUEST_CODE_LAUNCH_CAMERA
 import im.vector.app.core.utils.TextUtils
 import im.vector.app.core.utils.allGranted
 import im.vector.app.core.utils.checkPermissions
-import im.vector.app.core.utils.copyToClipboard
 import im.vector.app.core.utils.getSizeOfFiles
 import im.vector.app.core.utils.toast
 import im.vector.app.features.MainActivity
 import im.vector.app.features.MainActivityArgs
 import im.vector.app.features.media.createUCropWithDefaultSettings
-import im.vector.app.features.themes.ThemeUtils
 import im.vector.app.features.workers.signout.SignOutUiWorker
 import im.vector.lib.multipicker.MultiPicker
 import im.vector.lib.multipicker.entity.MultiPickerImageType
@@ -187,44 +183,6 @@ class VectorSettingsGeneralFragment : VectorSettingsBaseFragment() {
             mPasswordPreference.isVisible = false
         }
 
-        // Add Email
-        findPreference<EditTextPreference>(ADD_EMAIL_PREFERENCE_KEY)!!.let {
-            // It does not work on XML, do it here
-            it.icon = activity?.let {
-                ThemeUtils.tintDrawable(it,
-                        ContextCompat.getDrawable(it, R.drawable.ic_material_add)!!, R.attr.colorAccent)
-            }
-
-            // Unfortunately, this is not supported in lib v7
-            // it.editText.inputType = InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS
-            it.setOnPreferenceClickListener {
-                notImplemented()
-                true
-            }
-
-            it.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
-                notImplemented()
-                // addEmail((newValue as String).trim())
-                false
-            }
-        }
-
-        // Add phone number
-        findPreference<VectorPreference>(ADD_PHONE_NUMBER_PREFERENCE_KEY)!!.let {
-            // It does not work on XML, do it here
-            it.icon = activity?.let {
-                ThemeUtils.tintDrawable(it,
-                        ContextCompat.getDrawable(it, R.drawable.ic_material_add)!!, R.attr.colorAccent)
-            }
-
-            it.setOnPreferenceClickListener {
-                notImplemented()
-                // TODO val intent = PhoneNumberAdditionActivity.getIntent(activity, session.credentials.userId)
-                // startActivityForResult(intent, REQUEST_NEW_PHONE_NUMBER)
-                true
-            }
-        }
-
         // Advanced settings
 
         // user account
@@ -235,8 +193,6 @@ class VectorSettingsGeneralFragment : VectorSettingsBaseFragment() {
         findPreference<VectorPreference>(VectorPreferences.SETTINGS_HOME_SERVER_PREFERENCE_KEY)!!
                 .summary = session.sessionParams.homeServerUrl
 
-        refreshEmailsList()
-        refreshPhoneNumbersList()
         // Contacts
         setContactsPreferences()
 
@@ -533,295 +489,6 @@ class VectorSettingsGeneralFragment : VectorSettingsBaseFragment() {
      * Refresh phone number list
      */
     private fun refreshPhoneNumbersList() {
-        /* TODO
-        val currentPhoneNumber3PID = ArrayList(session.myUser.getlinkedPhoneNumbers())
-
-        val phoneNumberList = ArrayList<String>()
-        for (identifier in currentPhoneNumber3PID) {
-            phoneNumberList.add(identifier.address)
-        }
-
-        // check first if there is an update
-        var isNewList = true
-        if (phoneNumberList.size == mDisplayedPhoneNumber.size) {
-            isNewList = !mDisplayedPhoneNumber.containsAll(phoneNumberList)
-        }
-
-        if (isNewList) {
-            // remove the displayed one
-            run {
-                var index = 0
-                while (true) {
-                    val preference = mUserSettingsCategory.findPreference(PHONE_NUMBER_PREFERENCE_KEY_BASE + index)
-
-                    if (null != preference) {
-                        mUserSettingsCategory.removePreference(preference)
-                    } else {
-                        break
-                    }
-                    index++
-                }
-            }
-
-            // add new phone number list
-            mDisplayedPhoneNumber = phoneNumberList
-
-            val addPhoneBtn = mUserSettingsCategory.findPreference(ADD_PHONE_NUMBER_PREFERENCE_KEY)
-                    ?: return
-
-            var order = addPhoneBtn.order
-
-            for ((index, phoneNumber3PID) in currentPhoneNumber3PID.withIndex()) {
-                val preference = VectorPreference(activity!!)
-
-                preference.title = getString(R.string.settings_phone_number)
-                var phoneNumberFormatted = phoneNumber3PID.address
-                try {
-                    // Attempt to format phone number
-                    val phoneNumber = PhoneNumberUtil.getInstance().parse("+$phoneNumberFormatted", null)
-                    phoneNumberFormatted = PhoneNumberUtil.getInstance().format(phoneNumber, PhoneNumberUtil.PhoneNumberFormat.INTERNATIONAL)
-                } catch (e: NumberParseException) {
-                    // Do nothing, we will display raw version
-                }
-
-                preference.summary = phoneNumberFormatted
-                preference.key = PHONE_NUMBER_PREFERENCE_KEY_BASE + index
-                preference.order = order
-
-                preference.onPreferenceClickListener = Preference.OnPreferenceClickListener {
-                    displayDelete3PIDConfirmationDialog(phoneNumber3PID, preference.summary)
-                    true
-                }
-
-                preference.onPreferenceLongClickListener = object : VectorPreference.OnPreferenceLongClickListener {
-                    override fun onPreferenceLongClick(preference: Preference): Boolean {
-                        activity?.let { copyToClipboard(it, phoneNumber3PID.address) }
-                        return true
-                    }
-                }
-
-                order++
-                mUserSettingsCategory.addPreference(preference)
-            }
-
-            addPhoneBtn.order = order
-        }    */
-    }
-
-// ==============================================================================================================
-// Email management
-// ==============================================================================================================
-
-    /**
-     * Refresh the emails list
-     */
-    private fun refreshEmailsList() {
-        val currentEmail3PID = emptyList<String>() // TODO ArrayList(session.myUser.getlinkedEmails())
-
-        val newEmailsList = ArrayList<String>()
-        for (identifier in currentEmail3PID) {
-            // TODO newEmailsList.add(identifier.address)
-        }
-
-        // check first if there is an update
-        var isNewList = true
-        if (newEmailsList.size == mDisplayedEmails.size) {
-            isNewList = !mDisplayedEmails.containsAll(newEmailsList)
-        }
-
-        if (isNewList) {
-            // remove the displayed one
-            run {
-                var index = 0
-                while (true) {
-                    val preference = mUserSettingsCategory.findPreference<VectorPreference>(EMAIL_PREFERENCE_KEY_BASE + index)
-
-                    if (null != preference) {
-                        mUserSettingsCategory.removePreference(preference)
-                    } else {
-                        break
-                    }
-                    index++
-                }
-            }
-
-            // add new emails list
-            mDisplayedEmails = newEmailsList
-
-            val addEmailBtn = mUserSettingsCategory.findPreference<VectorPreference>(ADD_EMAIL_PREFERENCE_KEY) ?: return
-
-            var order = addEmailBtn.order
-
-            for ((index, email3PID) in currentEmail3PID.withIndex()) {
-                val preference = VectorPreference(requireActivity())
-
-                preference.title = getString(R.string.settings_email_address)
-                preference.summary = "TODO" // email3PID.address
-                preference.key = EMAIL_PREFERENCE_KEY_BASE + index
-                preference.order = order
-
-                preference.onPreferenceClickListener = Preference.OnPreferenceClickListener { pref ->
-                    displayDelete3PIDConfirmationDialog(/* TODO email3PID, */ pref.summary)
-                    true
-                }
-
-                preference.onPreferenceLongClickListener = object : VectorPreference.OnPreferenceLongClickListener {
-                    override fun onPreferenceLongClick(preference: Preference): Boolean {
-                        activity?.let { copyToClipboard(it, "TODO") } // email3PID.address) }
-                        return true
-                    }
-                }
-
-                mUserSettingsCategory.addPreference(preference)
-
-                order++
-            }
-
-            addEmailBtn.order = order
-        }
-    }
-
-    /**
-     * Attempt to add a new email to the account
-     *
-     * @param email the email to add.
-     */
-    private fun addEmail(email: String) {
-        // check first if the email syntax is valid
-        // if email is null , then also its invalid email
-        if (email.isBlank() || !Patterns.EMAIL_ADDRESS.matcher(email).matches()) {
-            activity?.toast(R.string.auth_invalid_email)
-            return
-        }
-
-        // check first if the email syntax is valid
-        if (mDisplayedEmails.indexOf(email) >= 0) {
-            activity?.toast(R.string.auth_email_already_defined)
-            return
-        }
-
-        notImplemented()
-        /* TODO
-        val pid = ThreePid(email, ThreePid.MEDIUM_EMAIL)
-
-        displayLoadingView()
-
-        session.myUser.requestEmailValidationToken(pid, object : MatrixCallback<Unit> {
-            override fun onSuccess(info: Void?) {
-                activity?.runOnUiThread { showEmailValidationDialog(pid) }
-            }
-
-            override fun onNetworkError(e: Exception) {
-                onCommonDone(e.localizedMessage)
-            }
-
-            override fun onMatrixError(e: MatrixError) {
-                if (TextUtils.equals(MatrixError.THREEPID_IN_USE, e.errcode)) {
-                    onCommonDone(getString(R.string.account_email_already_used_error))
-                } else {
-                    onCommonDone(e.localizedMessage)
-                }
-            }
-
-            override fun onUnexpectedError(e: Exception) {
-                onCommonDone(e.localizedMessage)
-            }
-        })
-        */
-    }
-
-    /**
-     * Show an email validation dialog to warn the user tho valid his email link.
-     *
-     * @param pid the used pid.
-     */
-/* TODO
-private fun showEmailValidationDialog(pid: ThreePid) {
-    activity?.let {
-        AlertDialog.Builder(it)
-                .setTitle(R.string.account_email_validation_title)
-                .setMessage(R.string.account_email_validation_message)
-                .setPositiveButton(R.string._continue) { _, _ ->
-                    session.myUser.add3Pid(pid, true, object : MatrixCallback<Unit> {
-                        override fun onSuccess(info: Void?) {
-                            it.runOnUiThread {
-                                hideLoadingView()
-                                refreshEmailsList()
-                            }
-                        }
-
-                        override fun onNetworkError(e: Exception) {
-                            onCommonDone(e.localizedMessage)
-                        }
-
-                        override fun onMatrixError(e: MatrixError) {
-                            if (TextUtils.equals(e.errcode, MatrixError.THREEPID_AUTH_FAILED)) {
-                                it.runOnUiThread {
-                                    hideLoadingView()
-                                    it.toast(R.string.account_email_validation_error)
-                                }
-                            } else {
-                                onCommonDone(e.localizedMessage)
-                            }
-                        }
-
-                        override fun onUnexpectedError(e: Exception) {
-                            onCommonDone(e.localizedMessage)
-                        }
-                    })
-                }
-                .setNegativeButton(R.string.cancel) { _, _ ->
-                    hideLoadingView()
-                }
-                .show()
-    }
-}    */
-
-    /**
-     * Display a dialog which asks confirmation for the deletion of a 3pid
-     *
-     * @param pid               the 3pid to delete
-     * @param preferenceSummary the displayed 3pid
-     */
-    private fun displayDelete3PIDConfirmationDialog(/* TODO pid: ThirdPartyIdentifier,*/ preferenceSummary: CharSequence) {
-        val mediumFriendlyName = "TODO" // ThreePid.getMediumFriendlyName(pid.medium, activity).toLowerCase(VectorLocale.applicationLocale)
-        val dialogMessage = getString(R.string.settings_delete_threepid_confirmation, mediumFriendlyName, preferenceSummary)
-
-        activity?.let {
-            AlertDialog.Builder(it)
-                    .setTitle(R.string.dialog_title_confirmation)
-                    .setMessage(dialogMessage)
-                    .setPositiveButton(R.string.remove) { _, _ ->
-                        notImplemented()
-                        /* TODO
-                        displayLoadingView()
-
-                        session.myUser.delete3Pid(pid, object : MatrixCallback<Unit> {
-                            override fun onSuccess(info: Void?) {
-                                when (pid.medium) {
-                                    ThreePid.MEDIUM_EMAIL -> refreshEmailsList()
-                                    ThreePid.MEDIUM_MSISDN -> refreshPhoneNumbersList()
-                                }
-                                onCommonDone(null)
-                            }
-
-                            override fun onNetworkError(e: Exception) {
-                                onCommonDone(e.localizedMessage)
-                            }
-
-                            override fun onMatrixError(e: MatrixError) {
-                                onCommonDone(e.localizedMessage)
-                            }
-
-                            override fun onUnexpectedError(e: Exception) {
-                                onCommonDone(e.localizedMessage)
-                            }
-                        })
-                        */
-                    }
-                    .setNegativeButton(R.string.cancel, null)
-                    .show()
-        }
     }
 
     /**
@@ -985,12 +652,6 @@ private fun showEmailValidationDialog(pid: ThreePid) {
     }
 
     companion object {
-        private const val ADD_EMAIL_PREFERENCE_KEY = "ADD_EMAIL_PREFERENCE_KEY"
-        private const val ADD_PHONE_NUMBER_PREFERENCE_KEY = "ADD_PHONE_NUMBER_PREFERENCE_KEY"
-
-        private const val EMAIL_PREFERENCE_KEY_BASE = "EMAIL_PREFERENCE_KEY_BASE"
-        private const val PHONE_NUMBER_PREFERENCE_KEY_BASE = "PHONE_NUMBER_PREFERENCE_KEY_BASE"
-
         private const val REQUEST_NEW_PHONE_NUMBER = 456
         private const val REQUEST_PHONEBOOK_COUNTRY = 789
     }
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewModel.kt
index 237c8c218d..37a0d392a1 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewModel.kt
@@ -28,6 +28,11 @@ import com.airbnb.mvrx.Uninitialized
 import com.airbnb.mvrx.ViewModelContext
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
+import im.vector.app.core.platform.VectorViewModel
+import io.reactivex.Observable
+import io.reactivex.functions.BiFunction
+import io.reactivex.subjects.PublishSubject
+import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.NoOpMatrixCallback
 import org.matrix.android.sdk.api.auth.data.LoginFlowTypes
@@ -41,11 +46,6 @@ import org.matrix.android.sdk.internal.crypto.crosssigning.DeviceTrustLevel
 import org.matrix.android.sdk.internal.crypto.model.CryptoDeviceInfo
 import org.matrix.android.sdk.internal.crypto.model.rest.DeviceInfo
 import org.matrix.android.sdk.internal.util.awaitCallback
-import im.vector.app.core.platform.VectorViewModel
-import io.reactivex.Observable
-import io.reactivex.functions.BiFunction
-import io.reactivex.subjects.PublishSubject
-import kotlinx.coroutines.launch
 import org.matrix.android.sdk.rx.rx
 import timber.log.Timber
 import java.util.concurrent.TimeUnit
@@ -309,7 +309,7 @@ class DevicesViewModel @AssistedInject constructor(
                 }
 
                 if (!isPasswordRequestFound) {
-                    // LoginFlowTypes.PASSWORD not supported, and this is the only one RiotX supports so far...
+                    // LoginFlowTypes.PASSWORD not supported, and this is the only one Element supports so far...
                     setState {
                         copy(
                                 request = Fail(failure)
diff --git a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsAction.kt b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsAction.kt
new file mode 100644
index 0000000000..07ce6b6744
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsAction.kt
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.settings.threepids
+
+import im.vector.app.core.platform.VectorViewModelAction
+import org.matrix.android.sdk.api.session.identity.ThreePid
+
+sealed class ThreePidsSettingsAction : VectorViewModelAction {
+    data class AddThreePid(val threePid: ThreePid) : ThreePidsSettingsAction()
+    data class ContinueThreePid(val threePid: ThreePid) : ThreePidsSettingsAction()
+    data class AccountPassword(val password: String) : ThreePidsSettingsAction()
+    data class DeleteThreePid(val threePid: ThreePid) : ThreePidsSettingsAction()
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsController.kt b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsController.kt
new file mode 100644
index 0000000000..dc59dd4ad2
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsController.kt
@@ -0,0 +1,145 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.settings.threepids
+
+import android.view.View
+import com.airbnb.epoxy.TypedEpoxyController
+import com.airbnb.mvrx.Async
+import com.airbnb.mvrx.Fail
+import com.airbnb.mvrx.Loading
+import com.airbnb.mvrx.Success
+import im.vector.app.R
+import im.vector.app.core.epoxy.loadingItem
+import im.vector.app.core.resources.ColorProvider
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.core.ui.list.GenericItem
+import im.vector.app.core.ui.list.genericButtonItem
+import im.vector.app.core.ui.list.genericFooterItem
+import im.vector.app.core.ui.list.genericItem
+import im.vector.app.features.discovery.settingsSectionTitleItem
+import org.matrix.android.sdk.api.session.identity.ThreePid
+import javax.inject.Inject
+
+class ThreePidsSettingsController @Inject constructor(
+        private val stringProvider: StringProvider,
+        private val colorProvider: ColorProvider
+) : TypedEpoxyController<ThreePidsSettingsViewState>() {
+
+    interface InteractionListener {
+        fun addEmail()
+        fun addMsisdn()
+        fun continueThreePid(threePid: ThreePid)
+        fun deleteThreePid(threePid: ThreePid)
+    }
+
+    var interactionListener: InteractionListener? = null
+
+    override fun buildModels(data: ThreePidsSettingsViewState?) {
+        if (data == null) return
+        when (data.threePids) {
+            is Loading -> {
+                loadingItem {
+                    id("loading")
+                    loadingText(stringProvider.getString(R.string.loading))
+                }
+            }
+            is Fail -> {
+                genericFooterItem {
+                    id("fail")
+                    text(data.threePids.error.localizedMessage)
+                }
+            }
+            is Success -> {
+                val dataList = data.threePids.invoke()
+                buildThreePids(dataList, data.pendingThreePids)
+            }
+        }
+    }
+
+    private fun buildThreePids(list: List<ThreePid>, pendingThreePids: Async<List<ThreePid>>) {
+        val splited = list.groupBy { it is ThreePid.Email }
+        val emails = splited[true].orEmpty()
+        val msisdn = splited[false].orEmpty()
+
+        settingsSectionTitleItem {
+            id("email")
+            title(stringProvider.getString(R.string.settings_emails))
+        }
+
+        emails.forEach { buildThreePid("email_", it) }
+
+        // Pending threePids
+        pendingThreePids.invoke()
+                ?.filterIsInstance(ThreePid.Email::class.java)
+                ?.forEach { buildPendingThreePid("email_", it) }
+
+        genericButtonItem {
+            id("addEmail")
+            text(stringProvider.getString(R.string.settings_add_email_address))
+            textColor(colorProvider.getColor(R.color.riotx_accent))
+            buttonClickAction(View.OnClickListener { interactionListener?.addEmail() })
+        }
+
+        settingsSectionTitleItem {
+            id("msisdn")
+            title(stringProvider.getString(R.string.settings_phone_numbers))
+        }
+
+        msisdn.forEach { buildThreePid("msisdn_", it) }
+
+        // Pending threePids
+        pendingThreePids.invoke()
+                ?.filterIsInstance(ThreePid.Msisdn::class.java)
+                ?.forEach { buildPendingThreePid("msisdn_", it) }
+
+        genericButtonItem {
+            id("addMsisdn")
+            text(stringProvider.getString(R.string.settings_add_phone_number))
+            textColor(colorProvider.getColor(R.color.riotx_accent))
+            buttonClickAction(View.OnClickListener { interactionListener?.addMsisdn() })
+        }
+    }
+
+    private fun buildThreePid(idPrefix: String, threePid: ThreePid) {
+        genericItem {
+            id(idPrefix + threePid.value)
+            title(threePid.value)
+            destructiveButtonAction(
+                    GenericItem.Action(stringProvider.getString(R.string.remove))
+                            .apply {
+                                perform = Runnable { interactionListener?.deleteThreePid(threePid) }
+                            }
+            )
+        }
+    }
+
+    private fun buildPendingThreePid(idPrefix: String, threePid: ThreePid) {
+        genericItem {
+            id(idPrefix + threePid.value)
+            title(threePid.value)
+            if (threePid is ThreePid.Email) {
+                description(stringProvider.getString(R.string.account_email_validation_message))
+            }
+            buttonAction(
+                    GenericItem.Action(stringProvider.getString(R.string._continue))
+                            .apply {
+                                perform = Runnable { interactionListener?.continueThreePid(threePid) }
+                            }
+            )
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsFragment.kt b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsFragment.kt
new file mode 100644
index 0000000000..875237bdc4
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsFragment.kt
@@ -0,0 +1,138 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.settings.threepids
+
+import android.content.DialogInterface
+import android.os.Bundle
+import android.text.InputType
+import android.view.View
+import android.widget.EditText
+import androidx.appcompat.app.AlertDialog
+import com.airbnb.mvrx.fragmentViewModel
+import com.airbnb.mvrx.withState
+import im.vector.app.R
+import im.vector.app.core.dialogs.PromptPasswordDialog
+import im.vector.app.core.dialogs.withColoredButton
+import im.vector.app.core.extensions.cleanup
+import im.vector.app.core.extensions.configureWith
+import im.vector.app.core.extensions.exhaustive
+import im.vector.app.core.extensions.isEmail
+import im.vector.app.core.platform.VectorBaseActivity
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.core.utils.toast
+import kotlinx.android.synthetic.main.fragment_generic_recycler.*
+import org.matrix.android.sdk.api.session.identity.ThreePid
+import javax.inject.Inject
+
+class ThreePidsSettingsFragment @Inject constructor(
+        private val viewModelFactory: ThreePidsSettingsViewModel.Factory,
+        private val epoxyController: ThreePidsSettingsController
+) :
+        VectorBaseFragment(),
+        ThreePidsSettingsViewModel.Factory by viewModelFactory,
+        ThreePidsSettingsController.InteractionListener {
+
+    private val viewModel: ThreePidsSettingsViewModel by fragmentViewModel()
+
+    override fun getLayoutResId() = R.layout.fragment_generic_recycler
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        recyclerView.configureWith(epoxyController)
+        epoxyController.interactionListener = this
+
+        viewModel.observeViewEvents {
+            when (it) {
+                is ThreePidsSettingsViewEvents.Failure -> displayErrorDialog(it.throwable)
+                ThreePidsSettingsViewEvents.RequestPassword -> askUserPassword()
+            }.exhaustive
+        }
+    }
+
+    private fun askUserPassword() {
+        PromptPasswordDialog().show(requireActivity()) { password ->
+            viewModel.handle(ThreePidsSettingsAction.AccountPassword(password))
+        }
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        recyclerView.cleanup()
+        epoxyController.interactionListener = null
+    }
+
+    override fun onResume() {
+        super.onResume()
+        (activity as? VectorBaseActivity)?.supportActionBar?.setTitle(R.string.settings_emails_and_phone_numbers_title)
+    }
+
+    override fun invalidate() = withState(viewModel) { state ->
+        if (state.isLoading) {
+            showLoadingDialog()
+        } else {
+            dismissLoadingDialog()
+        }
+        epoxyController.setData(state)
+    }
+
+    override fun addEmail() {
+        val inflater = requireActivity().layoutInflater
+        val layout = inflater.inflate(R.layout.dialog_base_edit_text, null)
+
+        val input = layout.findViewById<EditText>(R.id.editText)
+        input.inputType = InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS
+
+        AlertDialog.Builder(requireActivity())
+                .setTitle(R.string.settings_add_email_address)
+                .setView(layout)
+                .setPositiveButton(R.string.ok) { _, _ ->
+                    val email = input.text.toString()
+                    doAddEmail(email)
+                }
+                .setNegativeButton(R.string.cancel, null)
+                .show()
+    }
+
+    private fun doAddEmail(email: String) {
+        // Check that email is valid
+        if (!email.isEmail()) {
+            requireActivity().toast(R.string.auth_invalid_email)
+            return
+        }
+
+        viewModel.handle(ThreePidsSettingsAction.AddThreePid(ThreePid.Email(email)))
+    }
+
+    override fun addMsisdn() {
+        TODO("Not yet implemented")
+    }
+
+    override fun continueThreePid(threePid: ThreePid) {
+        viewModel.handle(ThreePidsSettingsAction.ContinueThreePid(threePid))
+    }
+
+    override fun deleteThreePid(threePid: ThreePid) {
+        AlertDialog.Builder(requireActivity())
+                .setMessage(getString(R.string.settings_remove_three_pid_confirmation_content, threePid.value))
+                .setPositiveButton(R.string.remove) { _, _ ->
+                    viewModel.handle(ThreePidsSettingsAction.DeleteThreePid(threePid))
+                }
+                .setNegativeButton(R.string.cancel, null)
+                .show()
+                .withColoredButton(DialogInterface.BUTTON_POSITIVE)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewEvents.kt b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewEvents.kt
new file mode 100644
index 0000000000..1ac2d10458
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewEvents.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.settings.threepids
+
+import im.vector.app.core.platform.VectorViewEvents
+
+sealed class ThreePidsSettingsViewEvents : VectorViewEvents {
+    data class Failure(val throwable: Throwable) : ThreePidsSettingsViewEvents()
+    object RequestPassword : ThreePidsSettingsViewEvents()
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewModel.kt
new file mode 100644
index 0000000000..85eb855569
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewModel.kt
@@ -0,0 +1,168 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.settings.threepids
+
+import androidx.lifecycle.viewModelScope
+import com.airbnb.mvrx.ActivityViewModelContext
+import com.airbnb.mvrx.FragmentViewModelContext
+import com.airbnb.mvrx.MvRxViewModelFactory
+import com.airbnb.mvrx.ViewModelContext
+import com.squareup.inject.assisted.Assisted
+import com.squareup.inject.assisted.AssistedInject
+import im.vector.app.core.extensions.exhaustive
+import im.vector.app.core.platform.VectorViewModel
+import kotlinx.coroutines.launch
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.auth.data.LoginFlowTypes
+import org.matrix.android.sdk.api.failure.Failure
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.identity.ThreePid
+import org.matrix.android.sdk.rx.rx
+
+class ThreePidsSettingsViewModel @AssistedInject constructor(
+        @Assisted initialState: ThreePidsSettingsViewState,
+        private val session: Session
+) : VectorViewModel<ThreePidsSettingsViewState, ThreePidsSettingsAction, ThreePidsSettingsViewEvents>(initialState) {
+
+    // UIA session
+    private var pendingThreePid: ThreePid? = null
+    private var pendingSession: String? = null
+
+    private val loadingCallback: MatrixCallback<Unit> = object : MatrixCallback<Unit> {
+        override fun onFailure(failure: Throwable) {
+            isLoading(false)
+
+            if (failure is Failure.RegistrationFlowError) {
+                var isPasswordRequestFound = false
+
+                // We only support LoginFlowTypes.PASSWORD
+                // Check if we can provide the user password
+                failure.registrationFlowResponse.flows?.forEach { interactiveAuthenticationFlow ->
+                    isPasswordRequestFound = isPasswordRequestFound || interactiveAuthenticationFlow.stages?.any { it == LoginFlowTypes.PASSWORD } == true
+                }
+
+                if (isPasswordRequestFound) {
+                    pendingSession = failure.registrationFlowResponse.session
+                    _viewEvents.post(ThreePidsSettingsViewEvents.RequestPassword)
+                } else {
+                    // LoginFlowTypes.PASSWORD not supported, and this is the only one Element supports so far...
+                    _viewEvents.post(ThreePidsSettingsViewEvents.Failure(failure))
+                }
+            } else {
+                _viewEvents.post(ThreePidsSettingsViewEvents.Failure(failure))
+            }
+        }
+
+        override fun onSuccess(data: Unit) {
+            pendingThreePid = null
+            pendingSession = null
+            isLoading(false)
+        }
+    }
+
+    private fun isLoading(isLoading: Boolean) {
+        setState {
+            copy(
+                    isLoading = isLoading
+            )
+        }
+    }
+
+    @AssistedInject.Factory
+    interface Factory {
+        fun create(initialState: ThreePidsSettingsViewState): ThreePidsSettingsViewModel
+    }
+
+    companion object : MvRxViewModelFactory<ThreePidsSettingsViewModel, ThreePidsSettingsViewState> {
+
+        @JvmStatic
+        override fun create(viewModelContext: ViewModelContext, state: ThreePidsSettingsViewState): ThreePidsSettingsViewModel? {
+            val factory = when (viewModelContext) {
+                is FragmentViewModelContext -> viewModelContext.fragment as? Factory
+                is ActivityViewModelContext -> viewModelContext.activity as? Factory
+            }
+            return factory?.create(state) ?: error("You should let your activity/fragment implements Factory interface")
+        }
+    }
+
+    init {
+        observeThreePids()
+        observePendingThreePids()
+    }
+
+    private fun observeThreePids() {
+        session.rx()
+                .liveThreePIds(true)
+                .execute {
+                    copy(
+                            threePids = it
+                    )
+                }
+    }
+
+    private fun observePendingThreePids() {
+        session.rx()
+                .livePendingThreePIds()
+                .execute {
+                    copy(
+                            pendingThreePids = it
+                    )
+                }
+    }
+
+    override fun handle(action: ThreePidsSettingsAction) {
+        when (action) {
+            is ThreePidsSettingsAction.AddThreePid      -> handleAddThreePid(action)
+            is ThreePidsSettingsAction.ContinueThreePid -> handleContinueThreePid(action)
+            is ThreePidsSettingsAction.AccountPassword  -> handleAccountPassword(action)
+            is ThreePidsSettingsAction.DeleteThreePid   -> handleDeleteThreePid(action)
+        }.exhaustive
+    }
+
+    private fun handleAddThreePid(action: ThreePidsSettingsAction.AddThreePid) {
+        isLoading(true)
+        viewModelScope.launch {
+            session.addThreePid(action.threePid, loadingCallback)
+        }
+    }
+
+    private fun handleContinueThreePid(action: ThreePidsSettingsAction.ContinueThreePid) {
+        isLoading(true)
+        pendingThreePid = action.threePid
+        viewModelScope.launch {
+            session.finalizeAddingThreePid(action.threePid, null, null, loadingCallback)
+        }
+    }
+
+    private fun handleAccountPassword(action: ThreePidsSettingsAction.AccountPassword) {
+        val safeSession = pendingSession ?: return Unit
+                .also { _viewEvents.post(ThreePidsSettingsViewEvents.Failure(IllegalStateException("No pending session"))) }
+        val safeThreePid = pendingThreePid ?: return Unit
+                .also { _viewEvents.post(ThreePidsSettingsViewEvents.Failure(IllegalStateException("No pending threePid"))) }
+        isLoading(true)
+        viewModelScope.launch {
+            session.finalizeAddingThreePid(safeThreePid, safeSession, action.password, loadingCallback)
+        }
+    }
+
+    private fun handleDeleteThreePid(action: ThreePidsSettingsAction.DeleteThreePid) {
+        isLoading(true)
+        viewModelScope.launch {
+            session.deleteThreePid(action.threePid, loadingCallback)
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewState.kt b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewState.kt
new file mode 100644
index 0000000000..10ac51f229
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewState.kt
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.settings.threepids
+
+import com.airbnb.mvrx.Async
+import com.airbnb.mvrx.MvRxState
+import com.airbnb.mvrx.Uninitialized
+import org.matrix.android.sdk.api.session.identity.ThreePid
+
+data class ThreePidsSettingsViewState(
+        val isLoading: Boolean = false,
+        val threePids: Async<List<ThreePid>> = Uninitialized,
+        val pendingThreePids: Async<List<ThreePid>> = Uninitialized
+) : MvRxState
diff --git a/vector/src/main/res/layout/item_generic_list.xml b/vector/src/main/res/layout/item_generic_list.xml
index 4b206c352d..f89413f15f 100644
--- a/vector/src/main/res/layout/item_generic_list.xml
+++ b/vector/src/main/res/layout/item_generic_list.xml
@@ -91,7 +91,7 @@
         app:layout_constraintTop_toTopOf="@+id/item_generic_title_text"
         tools:visibility="visible" />
 
-    <!-- Set a maw width because the text can be long -->
+    <!-- Set a max width because the text can be long -->
     <com.google.android.material.button.MaterialButton
         android:id="@+id/item_generic_action_button"
         style="@style/VectorButtonStyle"
@@ -102,10 +102,26 @@
         android:layout_marginBottom="16dp"
         android:maxWidth="@dimen/button_max_width"
         android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintBottom_toTopOf="@+id/item_generic_destructive_action_button"
         app:layout_constraintEnd_toStartOf="@+id/item_generic_barrier"
         app:layout_constraintTop_toBottomOf="@+id/item_generic_description_text"
         tools:text="@string/settings_troubleshoot_test_device_settings_quickfix"
         tools:visibility="visible" />
 
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/item_generic_destructive_action_button"
+        style="@style/VectorButtonStyleDestructive"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="4dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginBottom="16dp"
+        android:maxWidth="@dimen/button_max_width"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/item_generic_barrier"
+        app:layout_constraintTop_toBottomOf="@+id/item_generic_action_button"
+        tools:text="@string/delete"
+        tools:visibility="visible" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 7506a4d502..c22dfc6be8 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -682,6 +682,9 @@
     <string name="settings_add_3pid_flow_not_supported">You can\'t do this from Element mobile</string>
     <string name="settings_add_3pid_authentication_needed">Authentication is required</string>
 
+    <string name="settings_emails">Email addresses</string>
+    <string name="settings_phone_numbers">Phone numbers</string>
+    <string name="settings_remove_three_pid_confirmation_content">Remove %s?</string>
 
     <string name="settings_notification_advanced">Advanced Notification Settings</string>
     <string name="settings_notification_by_event">Notification importance by event</string>
@@ -927,6 +930,9 @@
     <string name="settings_unignore_user">Show all messages from %s?\n\nNote that this action will restart the app and it may take some time.</string>
     <string name="passwords_do_not_match">Passwords do not match</string>
 
+    <string name="settings_emails_and_phone_numbers_title">Emails and phone numbers</string>
+    <string name="settings_emails_and_phone_numbers_summary">Manage emails and phone numbers linked to your Matrix account</string>
+
     <string name="settings_delete_notification_targets_confirmation">Are you sure you want to remove this notification target?</string>
 
     <string name="settings_delete_threepid_confirmation">Are you sure you want to remove the %1$s %2$s?</string>
diff --git a/vector/src/main/res/xml/vector_settings_general.xml b/vector/src/main/res/xml/vector_settings_general.xml
index 042ea5c77c..5a9d016842 100644
--- a/vector/src/main/res/xml/vector_settings_general.xml
+++ b/vector/src/main/res/xml/vector_settings_general.xml
@@ -22,33 +22,11 @@
             android:summary="@string/change_password_summary"
             android:title="@string/settings_password" />
 
-        <!-- Email will be added here -->
-
-        <!-- Note: inputType does not work, it is set also in code, as well as iconTint -->
-        <im.vector.app.core.preference.VectorEditTextPreference
-            android:icon="@drawable/ic_material_add"
-            android:inputType="textEmailAddress"
-            android:key="ADD_EMAIL_PREFERENCE_KEY"
-            android:order="100"
-            android:title="@string/settings_add_email_address"
-            app:iconTint="@color/riotx_accent" />
-
-        <!-- Phone will be added here -->
-
-        <!-- Note: iconTint does not work, it is also done in code -->
         <im.vector.app.core.preference.VectorPreference
-            android:icon="@drawable/ic_material_add"
-            android:key="ADD_PHONE_NUMBER_PREFERENCE_KEY"
-            android:order="200"
-            android:title="@string/settings_add_phone_number"
-            app:iconTint="@color/riotx_accent" />
-
-        <im.vector.app.core.preference.VectorPreference
-            android:order="1000"
-            android:persistent="false"
-            android:summary="@string/settings_discovery_manage"
-            android:title="@string/settings_discovery_category"
-            app:fragment="im.vector.app.features.discovery.DiscoverySettingsFragment" />
+            android:key="SETTINGS_EMAILS_AND_PHONE_NUMBERS_PREFERENCE_KEY"
+            android:summary="@string/settings_emails_and_phone_numbers_summary"
+            android:title="@string/settings_emails_and_phone_numbers_title"
+            app:fragment="im.vector.app.features.settings.threepids.ThreePidsSettingsFragment" />
 
     </im.vector.app.core.preference.VectorPreferenceCategory>
 

From 36a9b800402ae58c6019a96d0083a9515d250b2c Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 28 Aug 2020 17:05:40 +0200
Subject: [PATCH 06/47] i18n for M_THREEPID_AUTH_FAILED

---
 .../src/main/java/im/vector/app/core/error/ErrorFormatter.kt   | 3 +++
 vector/src/main/res/values/strings.xml                         | 1 +
 2 files changed, 4 insertions(+)

diff --git a/vector/src/main/java/im/vector/app/core/error/ErrorFormatter.kt b/vector/src/main/java/im/vector/app/core/error/ErrorFormatter.kt
index 14939eaff9..2cd27e4ae5 100644
--- a/vector/src/main/java/im/vector/app/core/error/ErrorFormatter.kt
+++ b/vector/src/main/java/im/vector/app/core/error/ErrorFormatter.kt
@@ -91,6 +91,9 @@ class DefaultErrorFormatter @Inject constructor(
                             && throwable.error.message == "Email is already in use" -> {
                         stringProvider.getString(R.string.account_email_already_used_error)
                     }
+                    throwable.error.code == MatrixError.M_THREEPID_AUTH_FAILED      -> {
+                        stringProvider.getString(R.string.error_threepid_auth_failed)
+                    }
                     else                                                            -> {
                         throwable.error.message.takeIf { it.isNotEmpty() }
                                 ?: throwable.error.code.takeIf { it.isNotEmpty() }
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index c22dfc6be8..43a2f73947 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -685,6 +685,7 @@
     <string name="settings_emails">Email addresses</string>
     <string name="settings_phone_numbers">Phone numbers</string>
     <string name="settings_remove_three_pid_confirmation_content">Remove %s?</string>
+    <string name="error_threepid_auth_failed">Ensure that you have clicked on the link in the email we have sent to you.</string>
 
     <string name="settings_notification_advanced">Advanced Notification Settings</string>
     <string name="settings_notification_by_event">Notification importance by event</string>

From f6f9373aeb422f8f6d0bf45c4556cfe9ae992539 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 28 Aug 2020 17:06:17 +0200
Subject: [PATCH 07/47] Cleanup

---
 docs/add_email.md | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/docs/add_email.md b/docs/add_email.md
index 06b01b3026..2eb112fe79 100644
--- a/docs/add_email.md
+++ b/docs/add_email.md
@@ -84,8 +84,6 @@ User clicks on CONTINUE
 
 POST https://homeserver.org/_matrix/client/r0/account/3pid/add
 
-TODO: Remove "identifier"?
-
 ```json
 {
   "sid": "bxyDHuJKsdkjMlTJ",
@@ -94,10 +92,6 @@ TODO: Remove "identifier"?
     "session": "ppvvnozXCQZFaggUBlHJYPjA",
     "type": "m.login.password",
     "user": "@benoitx:matrix.org",
-    "identifier": {
-      "type": "m.id.user",
-      "user": "@benoitx:matrix.org"
-    },
     "password": "weak_password"
   }
 }

From 1af45ede62f4d497818d95c5887003354852b887 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 28 Aug 2020 17:55:38 +0200
Subject: [PATCH 08/47] Add some guard, and allow to cancel adding 3pid

---
 .../sdk/api/session/profile/ProfileService.kt |  6 ++
 .../session/profile/DefaultProfileService.kt  | 20 ++++++-
 .../profile/FinalizeAddingThreePidTask.kt     | 59 +++++++++++--------
 .../discovery/DiscoverySettingsController.kt  | 29 ++++-----
 .../discovery/SettingsContinueCancelItem.kt   | 21 +++----
 .../threepids/ThreePidsSettingsAction.kt      |  1 +
 .../threepids/ThreePidsSettingsController.kt  | 32 ++++++----
 .../threepids/ThreePidsSettingsFragment.kt    |  4 ++
 .../threepids/ThreePidsSettingsViewModel.kt   | 25 +++++++-
 9 files changed, 126 insertions(+), 71 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/profile/ProfileService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/profile/ProfileService.kt
index 95f142e877..5033a498d0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/profile/ProfileService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/profile/ProfileService.kt
@@ -107,6 +107,12 @@ interface ProfileService {
                                accountPassword: String?,
                                matrixCallback: MatrixCallback<Unit>): Cancelable
 
+    /**
+     * Cancel adding a threepid. It will remove data store locally about this ThreePid
+     */
+    fun cancelAddingThreePid(threePid: ThreePid,
+                             matrixCallback: MatrixCallback<Unit>): Cancelable
+
     /**
      * Delete a 3Pids.
      */
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DefaultProfileService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DefaultProfileService.kt
index cd81496814..b2f4ba0878 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DefaultProfileService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DefaultProfileService.kt
@@ -163,7 +163,25 @@ internal class DefaultProfileService @Inject constructor(private val taskExecuto
                                         accountPassword: String?,
                                         matrixCallback: MatrixCallback<Unit>): Cancelable {
         return finalizeAddingThreePidTask
-                .configureWith(FinalizeAddingThreePidTask.Params(threePid, uiaSession, accountPassword)) {
+                .configureWith(FinalizeAddingThreePidTask.Params(
+                        threePid = threePid,
+                        session = uiaSession,
+                        accountPassword = accountPassword,
+                        userWantsToCancel = false
+                )) {
+                    callback = alsoRefresh(matrixCallback)
+                }
+                .executeBy(taskExecutor)
+    }
+
+    override fun cancelAddingThreePid(threePid: ThreePid, matrixCallback: MatrixCallback<Unit>): Cancelable {
+        return finalizeAddingThreePidTask
+                .configureWith(FinalizeAddingThreePidTask.Params(
+                        threePid = threePid,
+                        session = null,
+                        accountPassword = null,
+                        userWantsToCancel = true
+                )) {
                     callback = alsoRefresh(matrixCallback)
                 }
                 .executeBy(taskExecutor)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/FinalizeAddingThreePidTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/FinalizeAddingThreePidTask.kt
index e6f4141ab1..3886b926ba 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/FinalizeAddingThreePidTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/FinalizeAddingThreePidTask.kt
@@ -36,7 +36,8 @@ internal abstract class FinalizeAddingThreePidTask : Task<FinalizeAddingThreePid
     data class Params(
             val threePid: ThreePid,
             val session: String?,
-            val accountPassword: String?
+            val accountPassword: String?,
+            val userWantsToCancel: Boolean
     )
 }
 
@@ -48,35 +49,41 @@ internal class DefaultFinalizeAddingThreePidTask @Inject constructor(
         private val eventBus: EventBus) : FinalizeAddingThreePidTask() {
 
     override suspend fun execute(params: Params) {
-        // Get the required pending data
-        val pendingThreePids = monarchy.fetchAllMappedSync(
-                { it.where(PendingThreePidEntity::class.java) },
-                { pendingThreePidMapper.map(it) }
-        )
-                .firstOrNull { it.threePid == params.threePid }
-                ?: throw IllegalArgumentException("unknown threepid")
+        if (params.userWantsToCancel.not()) {
+            // Get the required pending data
+            val pendingThreePids = monarchy.fetchAllMappedSync(
+                    { it.where(PendingThreePidEntity::class.java) },
+                    { pendingThreePidMapper.map(it) }
+            )
+                    .firstOrNull { it.threePid == params.threePid }
+                    ?: throw IllegalArgumentException("unknown threepid")
 
-        try {
-            executeRequest<Unit>(eventBus) {
-                val body = FinalizeAddThreePidBody(
-                        clientSecret = pendingThreePids.clientSecret,
-                        sid = pendingThreePids.sid,
-                        auth = if (params.session != null && params.accountPassword != null) {
-                            UserPasswordAuth(
-                                    session = params.session,
-                                    user = userId,
-                                    password = params.accountPassword
-                            )
-                        } else null
-                )
-                apiCall = profileAPI.finalizeAddThreePid(body)
+            try {
+                executeRequest<Unit>(eventBus) {
+                    val body = FinalizeAddThreePidBody(
+                            clientSecret = pendingThreePids.clientSecret,
+                            sid = pendingThreePids.sid,
+                            auth = if (params.session != null && params.accountPassword != null) {
+                                UserPasswordAuth(
+                                        session = params.session,
+                                        user = userId,
+                                        password = params.accountPassword
+                                )
+                            } else null
+                    )
+                    apiCall = profileAPI.finalizeAddThreePid(body)
+                }
+            } catch (throwable: Throwable) {
+                throw throwable.toRegistrationFlowResponse()
+                        ?.let { Failure.RegistrationFlowError(it) }
+                        ?: throwable
             }
-        } catch (throwable: Throwable) {
-            throw throwable.toRegistrationFlowResponse()
-                    ?.let { Failure.RegistrationFlowError(it) }
-                    ?: throwable
         }
 
+        cleanupDatabase(params)
+    }
+
+    private suspend fun cleanupDatabase(params: Params) {
         // Delete the pending three pid
         monarchy.awaitTransaction { realm ->
             realm.where(PendingThreePidEntity::class.java)
diff --git a/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsController.kt b/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsController.kt
index 6e1b5a5f57..b63f82be81 100644
--- a/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsController.kt
+++ b/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsController.kt
@@ -341,25 +341,22 @@ class DiscoverySettingsController @Inject constructor(
     private fun buildContinueCancel(threePid: ThreePid) {
         settingsContinueCancelItem {
             id("bottom${threePid.value}")
-            interactionListener(object : SettingsContinueCancelItem.Listener {
-                override fun onContinue() {
-                    when (threePid) {
-                        is ThreePid.Email  -> {
-                            listener?.checkEmailVerification(threePid)
-                        }
-                        is ThreePid.Msisdn -> {
-                            val code = codes[threePid]
-                            if (code != null) {
-                                listener?.sendMsisdnVerificationCode(threePid, code)
-                            }
+            continueOnClick {
+                when (threePid) {
+                    is ThreePid.Email  -> {
+                        listener?.checkEmailVerification(threePid)
+                    }
+                    is ThreePid.Msisdn -> {
+                        val code = codes[threePid]
+                        if (code != null) {
+                            listener?.sendMsisdnVerificationCode(threePid, code)
                         }
                     }
                 }
-
-                override fun onCancel() {
-                    listener?.cancelBinding(threePid)
-                }
-            })
+            }
+            cancelOnClick {
+                listener?.cancelBinding(threePid)
+            }
         }
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/discovery/SettingsContinueCancelItem.kt b/vector/src/main/java/im/vector/app/features/discovery/SettingsContinueCancelItem.kt
index bb225f4ef4..c9ad23f1a9 100644
--- a/vector/src/main/java/im/vector/app/features/discovery/SettingsContinueCancelItem.kt
+++ b/vector/src/main/java/im/vector/app/features/discovery/SettingsContinueCancelItem.kt
@@ -20,33 +20,28 @@ import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
 import com.airbnb.epoxy.EpoxyModelWithHolder
 import im.vector.app.R
+import im.vector.app.core.epoxy.ClickListener
 import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.onClick
 
 @EpoxyModelClass(layout = R.layout.item_settings_continue_cancel)
 abstract class SettingsContinueCancelItem : EpoxyModelWithHolder<SettingsContinueCancelItem.Holder>() {
 
     @EpoxyAttribute
-    var interactionListener: Listener? = null
+    var continueOnClick: ClickListener? = null
+
+    @EpoxyAttribute
+    var cancelOnClick: ClickListener? = null
 
     override fun bind(holder: Holder) {
         super.bind(holder)
 
-        holder.cancelButton.setOnClickListener {
-            interactionListener?.onCancel()
-        }
-
-        holder.continueButton.setOnClickListener {
-            interactionListener?.onContinue()
-        }
+        holder.cancelButton.onClick(cancelOnClick)
+        holder.continueButton.onClick(continueOnClick)
     }
 
     class Holder : VectorEpoxyHolder() {
         val cancelButton by bind<Button>(R.id.settings_item_cancel_button)
         val continueButton by bind<Button>(R.id.settings_item_continue_button)
     }
-
-    interface Listener {
-        fun onContinue()
-        fun onCancel()
-    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsAction.kt b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsAction.kt
index 07ce6b6744..c352bcfbda 100644
--- a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsAction.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsAction.kt
@@ -22,6 +22,7 @@ import org.matrix.android.sdk.api.session.identity.ThreePid
 sealed class ThreePidsSettingsAction : VectorViewModelAction {
     data class AddThreePid(val threePid: ThreePid) : ThreePidsSettingsAction()
     data class ContinueThreePid(val threePid: ThreePid) : ThreePidsSettingsAction()
+    data class CancelThreePid(val threePid: ThreePid) : ThreePidsSettingsAction()
     data class AccountPassword(val password: String) : ThreePidsSettingsAction()
     data class DeleteThreePid(val threePid: ThreePid) : ThreePidsSettingsAction()
 }
diff --git a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsController.kt b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsController.kt
index dc59dd4ad2..406ca50101 100644
--- a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsController.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsController.kt
@@ -30,6 +30,8 @@ import im.vector.app.core.ui.list.GenericItem
 import im.vector.app.core.ui.list.genericButtonItem
 import im.vector.app.core.ui.list.genericFooterItem
 import im.vector.app.core.ui.list.genericItem
+import im.vector.app.features.discovery.settingsContinueCancelItem
+import im.vector.app.features.discovery.settingsInformationItem
 import im.vector.app.features.discovery.settingsSectionTitleItem
 import org.matrix.android.sdk.api.session.identity.ThreePid
 import javax.inject.Inject
@@ -43,6 +45,7 @@ class ThreePidsSettingsController @Inject constructor(
         fun addEmail()
         fun addMsisdn()
         fun continueThreePid(threePid: ThreePid)
+        fun cancelThreePid(threePid: ThreePid)
         fun deleteThreePid(threePid: ThreePid)
     }
 
@@ -80,12 +83,12 @@ class ThreePidsSettingsController @Inject constructor(
             title(stringProvider.getString(R.string.settings_emails))
         }
 
-        emails.forEach { buildThreePid("email_", it) }
+        emails.forEach { buildThreePid("email ", it) }
 
         // Pending threePids
         pendingThreePids.invoke()
                 ?.filterIsInstance(ThreePid.Email::class.java)
-                ?.forEach { buildPendingThreePid("email_", it) }
+                ?.forEach { buildPendingThreePid("email ", it) }
 
         genericButtonItem {
             id("addEmail")
@@ -99,12 +102,12 @@ class ThreePidsSettingsController @Inject constructor(
             title(stringProvider.getString(R.string.settings_phone_numbers))
         }
 
-        msisdn.forEach { buildThreePid("msisdn_", it) }
+        msisdn.forEach { buildThreePid("msisdn ", it) }
 
         // Pending threePids
         pendingThreePids.invoke()
                 ?.filterIsInstance(ThreePid.Msisdn::class.java)
-                ?.forEach { buildPendingThreePid("msisdn_", it) }
+                ?.forEach { buildPendingThreePid("msisdn ", it) }
 
         genericButtonItem {
             id("addMsisdn")
@@ -131,15 +134,20 @@ class ThreePidsSettingsController @Inject constructor(
         genericItem {
             id(idPrefix + threePid.value)
             title(threePid.value)
-            if (threePid is ThreePid.Email) {
-                description(stringProvider.getString(R.string.account_email_validation_message))
+        }
+
+        if (threePid is ThreePid.Email) {
+            settingsInformationItem {
+                id("info" + idPrefix + threePid.value)
+                message(stringProvider.getString(R.string.account_email_validation_message))
+                colorProvider(colorProvider)
             }
-            buttonAction(
-                    GenericItem.Action(stringProvider.getString(R.string._continue))
-                            .apply {
-                                perform = Runnable { interactionListener?.continueThreePid(threePid) }
-                            }
-            )
+        }
+
+        settingsContinueCancelItem {
+            id("cont" + idPrefix + threePid.value)
+            continueOnClick { interactionListener?.continueThreePid(threePid) }
+            cancelOnClick { interactionListener?.cancelThreePid(threePid) }
         }
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsFragment.kt b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsFragment.kt
index 875237bdc4..1f95d78026 100644
--- a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsFragment.kt
@@ -125,6 +125,10 @@ class ThreePidsSettingsFragment @Inject constructor(
         viewModel.handle(ThreePidsSettingsAction.ContinueThreePid(threePid))
     }
 
+    override fun cancelThreePid(threePid: ThreePid) {
+        viewModel.handle(ThreePidsSettingsAction.CancelThreePid(threePid))
+    }
+
     override fun deleteThreePid(threePid: ThreePid) {
         AlertDialog.Builder(requireActivity())
                 .setMessage(getString(R.string.settings_remove_three_pid_confirmation_content, threePid.value))
diff --git a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewModel.kt
index 85eb855569..00a58f0610 100644
--- a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewModel.kt
@@ -23,8 +23,10 @@ import com.airbnb.mvrx.MvRxViewModelFactory
 import com.airbnb.mvrx.ViewModelContext
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
+import im.vector.app.R
 import im.vector.app.core.extensions.exhaustive
 import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.core.resources.StringProvider
 import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.auth.data.LoginFlowTypes
@@ -35,7 +37,8 @@ import org.matrix.android.sdk.rx.rx
 
 class ThreePidsSettingsViewModel @AssistedInject constructor(
         @Assisted initialState: ThreePidsSettingsViewState,
-        private val session: Session
+        private val session: Session,
+        private val stringProvider: StringProvider
 ) : VectorViewModel<ThreePidsSettingsViewState, ThreePidsSettingsAction, ThreePidsSettingsViewEvents>(initialState) {
 
     // UIA session
@@ -128,6 +131,7 @@ class ThreePidsSettingsViewModel @AssistedInject constructor(
         when (action) {
             is ThreePidsSettingsAction.AddThreePid      -> handleAddThreePid(action)
             is ThreePidsSettingsAction.ContinueThreePid -> handleContinueThreePid(action)
+            is ThreePidsSettingsAction.CancelThreePid   -> handleCancelThreePid(action)
             is ThreePidsSettingsAction.AccountPassword  -> handleAccountPassword(action)
             is ThreePidsSettingsAction.DeleteThreePid   -> handleDeleteThreePid(action)
         }.exhaustive
@@ -135,8 +139,16 @@ class ThreePidsSettingsViewModel @AssistedInject constructor(
 
     private fun handleAddThreePid(action: ThreePidsSettingsAction.AddThreePid) {
         isLoading(true)
-        viewModelScope.launch {
-            session.addThreePid(action.threePid, loadingCallback)
+
+        withState { state ->
+            val allThreePids = state.threePids.invoke().orEmpty() + state.pendingThreePids.invoke().orEmpty()
+            if (allThreePids.any { it.value == action.threePid.value }) {
+                _viewEvents.post(ThreePidsSettingsViewEvents.Failure(IllegalArgumentException(stringProvider.getString(R.string.auth_email_already_defined))))
+            } else {
+                viewModelScope.launch {
+                    session.addThreePid(action.threePid, loadingCallback)
+                }
+            }
         }
     }
 
@@ -148,6 +160,13 @@ class ThreePidsSettingsViewModel @AssistedInject constructor(
         }
     }
 
+    private fun handleCancelThreePid(action: ThreePidsSettingsAction.CancelThreePid) {
+        isLoading(true)
+        viewModelScope.launch {
+            session.cancelAddingThreePid(action.threePid, loadingCallback)
+        }
+    }
+
     private fun handleAccountPassword(action: ThreePidsSettingsAction.AccountPassword) {
         val safeSession = pendingSession ?: return Unit
                 .also { _viewEvents.post(ThreePidsSettingsViewEvents.Failure(IllegalStateException("No pending session"))) }

From e8e1330cd5343ad40890e7a57edfa52c51d78749 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 28 Aug 2020 18:05:07 +0200
Subject: [PATCH 09/47] Cleanup

---
 .../java/im/vector/app/features/discovery/SettingsItem.kt     | 4 ++--
 .../features/discovery/SettingsTextButtonSingleLineItem.kt    | 4 ++--
 .../src/main/res/layout/item_settings_button_single_line.xml  | 2 +-
 vector/src/main/res/layout/item_settings_simple_item.xml      | 3 +--
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/discovery/SettingsItem.kt b/vector/src/main/java/im/vector/app/features/discovery/SettingsItem.kt
index 53bf7e64d6..3471a3ab56 100644
--- a/vector/src/main/java/im/vector/app/features/discovery/SettingsItem.kt
+++ b/vector/src/main/java/im/vector/app/features/discovery/SettingsItem.kt
@@ -16,13 +16,13 @@
 package im.vector.app.features.discovery
 
 import android.view.View
-import android.widget.Switch
 import android.widget.TextView
 import androidx.annotation.StringRes
 import androidx.core.view.isVisible
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
 import com.airbnb.epoxy.EpoxyModelWithHolder
+import com.google.android.material.switchmaterial.SwitchMaterial
 import im.vector.app.R
 import im.vector.app.core.epoxy.VectorEpoxyHolder
 import im.vector.app.core.extensions.setTextOrHide
@@ -69,6 +69,6 @@ abstract class SettingsItem : EpoxyModelWithHolder<SettingsItem.Holder>() {
     class Holder : VectorEpoxyHolder() {
         val titleText by bind<TextView>(R.id.settings_item_title)
         val descriptionText by bind<TextView>(R.id.settings_item_description)
-        val switchButton by bind<Switch>(R.id.settings_item_switch)
+        val switchButton by bind<SwitchMaterial>(R.id.settings_item_switch)
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/discovery/SettingsTextButtonSingleLineItem.kt b/vector/src/main/java/im/vector/app/features/discovery/SettingsTextButtonSingleLineItem.kt
index b7d9997d46..9f64a68d4f 100644
--- a/vector/src/main/java/im/vector/app/features/discovery/SettingsTextButtonSingleLineItem.kt
+++ b/vector/src/main/java/im/vector/app/features/discovery/SettingsTextButtonSingleLineItem.kt
@@ -18,7 +18,6 @@ package im.vector.app.features.discovery
 import android.widget.Button
 import android.widget.CompoundButton
 import android.widget.ProgressBar
-import android.widget.Switch
 import android.widget.TextView
 import androidx.annotation.StringRes
 import androidx.core.content.ContextCompat
@@ -27,6 +26,7 @@ import androidx.core.view.isVisible
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
 import com.airbnb.epoxy.EpoxyModelWithHolder
+import com.google.android.material.switchmaterial.SwitchMaterial
 import im.vector.app.R
 import im.vector.app.core.epoxy.ClickListener
 import im.vector.app.core.epoxy.VectorEpoxyHolder
@@ -160,7 +160,7 @@ abstract class SettingsTextButtonSingleLineItem : EpoxyModelWithHolder<SettingsT
     class Holder : VectorEpoxyHolder() {
         val textView by bind<TextView>(R.id.settings_item_text)
         val mainButton by bind<Button>(R.id.settings_item_button)
-        val switchButton by bind<Switch>(R.id.settings_item_switch)
+        val switchButton by bind<SwitchMaterial>(R.id.settings_item_switch)
         val progress by bind<ProgressBar>(R.id.settings_item_progress)
     }
 }
diff --git a/vector/src/main/res/layout/item_settings_button_single_line.xml b/vector/src/main/res/layout/item_settings_button_single_line.xml
index 592eb6dd96..583ed541ca 100644
--- a/vector/src/main/res/layout/item_settings_button_single_line.xml
+++ b/vector/src/main/res/layout/item_settings_button_single_line.xml
@@ -51,7 +51,7 @@
         app:layout_constraintTop_toTopOf="parent"
         tools:visibility="visible" />
 
-    <Switch
+    <com.google.android.material.switchmaterial.SwitchMaterial
         android:id="@+id/settings_item_switch"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/vector/src/main/res/layout/item_settings_simple_item.xml b/vector/src/main/res/layout/item_settings_simple_item.xml
index 2aeda8c295..7fe7937da6 100644
--- a/vector/src/main/res/layout/item_settings_simple_item.xml
+++ b/vector/src/main/res/layout/item_settings_simple_item.xml
@@ -21,7 +21,6 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="4dp"
-            android:orientation="vertical"
             android:textColor="?android:textColorPrimary"
             android:textSize="15sp"
             android:textStyle="bold"
@@ -38,7 +37,7 @@
             tools:text="Description / Value" />
     </LinearLayout>
 
-    <Switch
+    <com.google.android.material.switchmaterial.SwitchMaterial
         android:id="@+id/settings_item_switch"
         android:layout_width="50dp"
         android:layout_height="50dp"

From 9fecc1b992adf14ec02ae899b502346aaa981b43 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 28 Aug 2020 18:05:59 +0200
Subject: [PATCH 10/47] Reduce button width

---
 vector/src/main/res/layout/item_settings_button.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/src/main/res/layout/item_settings_button.xml b/vector/src/main/res/layout/item_settings_button.xml
index d994a7fe99..9070eb37b7 100644
--- a/vector/src/main/res/layout/item_settings_button.xml
+++ b/vector/src/main/res/layout/item_settings_button.xml
@@ -9,7 +9,7 @@
     <Button
         android:id="@+id/settings_item_button"
         style="@style/VectorButtonStyleText"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         tools:text="@string/action_change" />

From da4695ff2a17d8617af4fd585846dcd294480acf Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 28 Aug 2020 18:35:04 +0200
Subject: [PATCH 11/47] Improve UI of threePid screen

---
 .../settings/threepids/ThreePidItem.kt        | 64 +++++++++++++++++++
 .../threepids/ThreePidsSettingsController.kt  | 21 +++---
 .../res/layout/item_settings_three_pid.xml    | 47 ++++++++++++++
 3 files changed, 120 insertions(+), 12 deletions(-)
 create mode 100644 vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidItem.kt
 create mode 100644 vector/src/main/res/layout/item_settings_three_pid.xml

diff --git a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidItem.kt b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidItem.kt
new file mode 100644
index 0000000000..6b05c9f96e
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidItem.kt
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package im.vector.app.features.settings.threepids
+
+import android.view.View
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.annotation.DrawableRes
+import androidx.core.view.isVisible
+import com.airbnb.epoxy.EpoxyAttribute
+import com.airbnb.epoxy.EpoxyModelClass
+import com.airbnb.epoxy.EpoxyModelWithHolder
+import im.vector.app.R
+import im.vector.app.core.epoxy.ClickListener
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.onClick
+
+@EpoxyModelClass(layout = R.layout.item_settings_three_pid)
+abstract class ThreePidItem : EpoxyModelWithHolder<ThreePidItem.Holder>() {
+
+    @EpoxyAttribute
+    var title: String? = null
+
+    @EpoxyAttribute
+    @DrawableRes
+    var iconResId: Int? = null
+
+    @EpoxyAttribute
+    var deleteClickListener: ClickListener? = null
+
+    override fun bind(holder: Holder) {
+        super.bind(holder)
+        val safeIconResId = iconResId
+        if (safeIconResId != null) {
+            holder.icon.isVisible = true
+            holder.icon.setImageResource(safeIconResId)
+        } else {
+            holder.icon.isVisible = false
+        }
+
+        holder.title.text = title
+        holder.delete.onClick { deleteClickListener?.invoke() }
+        holder.delete.isVisible = deleteClickListener != null
+    }
+
+    class Holder : VectorEpoxyHolder() {
+        val icon by bind<ImageView>(R.id.item_settings_three_pid_icon)
+        val title by bind<TextView>(R.id.item_settings_three_pid_title)
+        val delete by bind<View>(R.id.item_settings_three_pid_delete)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsController.kt b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsController.kt
index 406ca50101..3899ac9166 100644
--- a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsController.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsController.kt
@@ -26,10 +26,8 @@ import im.vector.app.R
 import im.vector.app.core.epoxy.loadingItem
 import im.vector.app.core.resources.ColorProvider
 import im.vector.app.core.resources.StringProvider
-import im.vector.app.core.ui.list.GenericItem
 import im.vector.app.core.ui.list.genericButtonItem
 import im.vector.app.core.ui.list.genericFooterItem
-import im.vector.app.core.ui.list.genericItem
 import im.vector.app.features.discovery.settingsContinueCancelItem
 import im.vector.app.features.discovery.settingsInformationItem
 import im.vector.app.features.discovery.settingsSectionTitleItem
@@ -88,7 +86,7 @@ class ThreePidsSettingsController @Inject constructor(
         // Pending threePids
         pendingThreePids.invoke()
                 ?.filterIsInstance(ThreePid.Email::class.java)
-                ?.forEach { buildPendingThreePid("email ", it) }
+                ?.forEach { buildPendingThreePid("p_email ", it) }
 
         genericButtonItem {
             id("addEmail")
@@ -107,7 +105,7 @@ class ThreePidsSettingsController @Inject constructor(
         // Pending threePids
         pendingThreePids.invoke()
                 ?.filterIsInstance(ThreePid.Msisdn::class.java)
-                ?.forEach { buildPendingThreePid("msisdn ", it) }
+                ?.forEach { buildPendingThreePid("p_msisdn ", it) }
 
         genericButtonItem {
             id("addMsisdn")
@@ -118,21 +116,20 @@ class ThreePidsSettingsController @Inject constructor(
     }
 
     private fun buildThreePid(idPrefix: String, threePid: ThreePid) {
-        genericItem {
+        threePidItem {
             id(idPrefix + threePid.value)
+            // TODO Add an icon for emails
+            iconResId(if (threePid is ThreePid.Msisdn) R.drawable.ic_phone else null)
             title(threePid.value)
-            destructiveButtonAction(
-                    GenericItem.Action(stringProvider.getString(R.string.remove))
-                            .apply {
-                                perform = Runnable { interactionListener?.deleteThreePid(threePid) }
-                            }
-            )
+            deleteClickListener { interactionListener?.deleteThreePid(threePid) }
         }
     }
 
     private fun buildPendingThreePid(idPrefix: String, threePid: ThreePid) {
-        genericItem {
+        threePidItem {
             id(idPrefix + threePid.value)
+            // TODO Add an icon for emails
+            iconResId(if (threePid is ThreePid.Msisdn) R.drawable.ic_phone else null)
             title(threePid.value)
         }
 
diff --git a/vector/src/main/res/layout/item_settings_three_pid.xml b/vector/src/main/res/layout/item_settings_three_pid.xml
new file mode 100644
index 0000000000..fd3443ac17
--- /dev/null
+++ b/vector/src/main/res/layout/item_settings_three_pid.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="64dp"
+    android:paddingStart="@dimen/layout_horizontal_margin"
+    android:paddingEnd="@dimen/layout_horizontal_margin">
+
+    <ImageView
+        android:id="@+id/item_settings_three_pid_icon"
+        android:layout_width="16dp"
+        android:layout_height="16dp"
+        android:scaleType="center"
+        android:tint="?riotx_text_secondary"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:src="@drawable/ic_phone" />
+
+    <TextView
+        android:id="@+id/item_settings_three_pid_title"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:layout_marginBottom="4dp"
+        android:textColor="?riotx_text_primary"
+        android:textSize="16sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/item_settings_three_pid_delete"
+        app:layout_constraintStart_toEndOf="@+id/item_settings_three_pid_icon"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="alice@email-provider.org" />
+
+    <ImageView
+        android:id="@+id/item_settings_three_pid_delete"
+        android:layout_width="@dimen/layout_touch_size"
+        android:layout_height="@dimen/layout_touch_size"
+        android:scaleType="center"
+        android:src="@drawable/ic_trash_24"
+        android:tint="@color/riotx_destructive_accent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 58938a239e9fc26f00413f19a81b045546b9f314 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 28 Aug 2020 19:07:41 +0200
Subject: [PATCH 12/47] Format phone number

---
 .../im/vector/app/core/extensions/ThreePid.kt | 36 +++++++++++++++++++
 .../discovery/DiscoverySettingsController.kt  | 14 ++------
 .../threepids/ThreePidsSettingsController.kt  | 20 ++++++++---
 vector/src/main/res/values/strings.xml        |  1 +
 4 files changed, 55 insertions(+), 16 deletions(-)
 create mode 100644 vector/src/main/java/im/vector/app/core/extensions/ThreePid.kt

diff --git a/vector/src/main/java/im/vector/app/core/extensions/ThreePid.kt b/vector/src/main/java/im/vector/app/core/extensions/ThreePid.kt
new file mode 100644
index 0000000000..8afbfd0f63
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/core/extensions/ThreePid.kt
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.core.extensions
+
+import com.google.i18n.phonenumbers.PhoneNumberUtil
+import org.matrix.android.sdk.api.extensions.tryThis
+import org.matrix.android.sdk.api.session.identity.ThreePid
+
+fun ThreePid.getFormattedValue(): String {
+    return when (this) {
+        is ThreePid.Email  -> email
+        is ThreePid.Msisdn -> {
+            tryThis(message = "Unable to parse the phone number") {
+                PhoneNumberUtil.getInstance().parse("+$msisdn", null)
+            }
+                    ?.let {
+                        PhoneNumberUtil.getInstance().format(it, PhoneNumberUtil.PhoneNumberFormat.INTERNATIONAL)
+                    }
+                    ?: msisdn
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsController.kt b/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsController.kt
index b63f82be81..e68537a108 100644
--- a/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsController.kt
+++ b/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsController.kt
@@ -23,19 +23,18 @@ import com.airbnb.mvrx.Incomplete
 import com.airbnb.mvrx.Loading
 import com.airbnb.mvrx.Success
 import com.airbnb.mvrx.Uninitialized
-import com.google.i18n.phonenumbers.PhoneNumberUtil
 import im.vector.app.R
 import im.vector.app.core.epoxy.attributes.ButtonStyle
 import im.vector.app.core.epoxy.attributes.ButtonType
 import im.vector.app.core.epoxy.attributes.IconMode
 import im.vector.app.core.epoxy.loadingItem
 import im.vector.app.core.error.ErrorFormatter
+import im.vector.app.core.extensions.getFormattedValue
 import im.vector.app.core.resources.ColorProvider
 import im.vector.app.core.resources.StringProvider
 import org.matrix.android.sdk.api.failure.Failure
 import org.matrix.android.sdk.api.session.identity.SharedState
 import org.matrix.android.sdk.api.session.identity.ThreePid
-import timber.log.Timber
 import javax.inject.Inject
 import javax.net.ssl.HttpsURLConnection
 
@@ -235,16 +234,7 @@ class DiscoverySettingsController @Inject constructor(
     }
 
     private fun buildMsisdn(pidInfo: PidInfo) {
-        val phoneNumber = try {
-            PhoneNumberUtil.getInstance().parse("+${pidInfo.threePid.value}", null)
-        } catch (t: Throwable) {
-            Timber.e(t, "Unable to parse the phone number")
-            null
-        }
-                ?.let {
-                    PhoneNumberUtil.getInstance().format(it, PhoneNumberUtil.PhoneNumberFormat.INTERNATIONAL)
-                }
-                ?: pidInfo.threePid.value
+        val phoneNumber = pidInfo.threePid.getFormattedValue()
 
         buildThreePid(pidInfo, phoneNumber)
 
diff --git a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsController.kt b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsController.kt
index 3899ac9166..9e77adafc9 100644
--- a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsController.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsController.kt
@@ -24,6 +24,8 @@ import com.airbnb.mvrx.Loading
 import com.airbnb.mvrx.Success
 import im.vector.app.R
 import im.vector.app.core.epoxy.loadingItem
+import im.vector.app.core.epoxy.noResultItem
+import im.vector.app.core.extensions.getFormattedValue
 import im.vector.app.core.resources.ColorProvider
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.core.ui.list.genericButtonItem
@@ -107,20 +109,30 @@ class ThreePidsSettingsController @Inject constructor(
                 ?.filterIsInstance(ThreePid.Msisdn::class.java)
                 ?.forEach { buildPendingThreePid("p_msisdn ", it) }
 
+        /*
+        // TODO Support adding MSISDN
         genericButtonItem {
             id("addMsisdn")
             text(stringProvider.getString(R.string.settings_add_phone_number))
             textColor(colorProvider.getColor(R.color.riotx_accent))
             buttonClickAction(View.OnClickListener { interactionListener?.addMsisdn() })
         }
+         */
+        // Avoid empty area
+        if (msisdn.isEmpty()) {
+            noResultItem {
+                id("no_msisdn")
+                text(stringProvider.getString(R.string.settings_phone_numbers_empty))
+            }
+        }
     }
 
     private fun buildThreePid(idPrefix: String, threePid: ThreePid) {
         threePidItem {
             id(idPrefix + threePid.value)
             // TODO Add an icon for emails
-            iconResId(if (threePid is ThreePid.Msisdn) R.drawable.ic_phone else null)
-            title(threePid.value)
+            // iconResId(if (threePid is ThreePid.Msisdn) R.drawable.ic_phone else null)
+            title(threePid.getFormattedValue())
             deleteClickListener { interactionListener?.deleteThreePid(threePid) }
         }
     }
@@ -129,8 +141,8 @@ class ThreePidsSettingsController @Inject constructor(
         threePidItem {
             id(idPrefix + threePid.value)
             // TODO Add an icon for emails
-            iconResId(if (threePid is ThreePid.Msisdn) R.drawable.ic_phone else null)
-            title(threePid.value)
+            // iconResId(if (threePid is ThreePid.Msisdn) R.drawable.ic_phone else null)
+            title(threePid.getFormattedValue())
         }
 
         if (threePid is ThreePid.Email) {
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 43a2f73947..553dc1674e 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -684,6 +684,7 @@
 
     <string name="settings_emails">Email addresses</string>
     <string name="settings_phone_numbers">Phone numbers</string>
+    <string name="settings_phone_numbers_empty">No phone number has been added to your account</string>
     <string name="settings_remove_three_pid_confirmation_content">Remove %s?</string>
     <string name="error_threepid_auth_failed">Ensure that you have clicked on the link in the email we have sent to you.</string>
 

From aedcf3006a34ab46a27fb7cd424642b216da4725 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Mon, 31 Aug 2020 12:08:37 +0200
Subject: [PATCH 13/47] Relax IS dicovery

fixes #2027
---
 CHANGES.md                                    |  1 +
 .../sdk/api/auth/wellknown/WellknownResult.kt |  2 +-
 .../internal/wellknown/GetWellknownTask.kt    |  8 +++----
 .../app/features/login/LoginViewModel.kt      | 23 ++++++++++++++-----
 4 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 1ffb6bcad0..6ba9e7728b 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -17,6 +17,7 @@ Bugfix 🐛:
  - Change user or room avatar: when selecting Gallery, I'm not proposed to crop the selected image (#1590)
  - Fix uploads still don't work with room v6 (#1879)
  - Can't handle ongoing call events in background (#1992)
+ - Login with Matrix-Id | Autodiscovery fails if identity server is invalid and Homeserver ok (#2027)
 
 Translations 🗣:
  -
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/wellknown/WellknownResult.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/wellknown/WellknownResult.kt
index a736a4f1be..ec2dfd214c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/wellknown/WellknownResult.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/wellknown/WellknownResult.kt
@@ -45,7 +45,7 @@ sealed class WellknownResult {
     /**
      * Inform the user that auto-discovery failed due to invalid/empty data and PROMPT for the parameter.
      */
-    object FailPrompt : WellknownResult()
+    data class FailPrompt(val homeServerUrl: String?, val wellKnown: WellKnown?) : WellknownResult()
 
     /**
      * Inform the user that auto-discovery did not return any usable URLs. Do not continue further with the current login process.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/wellknown/GetWellknownTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/wellknown/GetWellknownTask.kt
index e20fe9a304..80ede5e884 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/wellknown/GetWellknownTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/wellknown/GetWellknownTask.kt
@@ -97,7 +97,7 @@ internal class DefaultGetWellknownTask @Inject constructor(
             // Success
             val homeServerBaseUrl = wellKnown.homeServer?.baseURL
             if (homeServerBaseUrl.isNullOrBlank()) {
-                WellknownResult.FailPrompt
+                WellknownResult.FailPrompt(null, null)
             } else {
                 if (homeServerBaseUrl.isValidUrl()) {
                     // Check that HS is a real one
@@ -120,11 +120,11 @@ internal class DefaultGetWellknownTask @Inject constructor(
                 is Failure.OtherServerError                -> {
                     when (throwable.httpCode) {
                         HttpsURLConnection.HTTP_NOT_FOUND -> WellknownResult.Ignore
-                        else                              -> WellknownResult.FailPrompt
+                        else                              -> WellknownResult.FailPrompt(null, null)
                     }
                 }
                 is MalformedJsonException, is EOFException -> {
-                    WellknownResult.FailPrompt
+                    WellknownResult.FailPrompt(null, null)
                 }
                 else                                       -> {
                     throw throwable
@@ -162,7 +162,7 @@ internal class DefaultGetWellknownTask @Inject constructor(
                         // All is ok
                         WellknownResult.Prompt(homeServerBaseUrl, identityServerBaseUrl, wellKnown)
                     } else {
-                        WellknownResult.FailError
+                        WellknownResult.FailPrompt(homeServerBaseUrl, wellKnown)
                     }
                 } else {
                     WellknownResult.FailError
diff --git a/vector/src/main/java/im/vector/app/features/login/LoginViewModel.kt b/vector/src/main/java/im/vector/app/features/login/LoginViewModel.kt
index 93f8f7a45c..aed186bcd6 100644
--- a/vector/src/main/java/im/vector/app/features/login/LoginViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginViewModel.kt
@@ -522,6 +522,13 @@ class LoginViewModel @AssistedInject constructor(
                 when (data) {
                     is WellknownResult.Prompt          ->
                         onWellknownSuccess(action, data, homeServerConnectionConfig)
+                    is WellknownResult.FailPrompt      ->
+                        // Relax on IS discovery if home server is valid
+                        if (data.homeServerUrl != null && data.wellKnown != null) {
+                            onWellknownSuccess(action, WellknownResult.Prompt(data.homeServerUrl!!, null, data.wellKnown!!), homeServerConnectionConfig)
+                        } else {
+                            onWellKnownError()
+                        }
                     is WellknownResult.InvalidMatrixId -> {
                         setState {
                             copy(
@@ -531,12 +538,7 @@ class LoginViewModel @AssistedInject constructor(
                         _viewEvents.post(LoginViewEvents.Failure(Exception(stringProvider.getString(R.string.login_signin_matrix_id_error_invalid_matrix_id))))
                     }
                     else                               -> {
-                        setState {
-                            copy(
-                                    asyncLoginAction = Uninitialized
-                            )
-                        }
-                        _viewEvents.post(LoginViewEvents.Failure(Exception(stringProvider.getString(R.string.autodiscover_well_known_error))))
+                        onWellKnownError()
                     }
                 }.exhaustive
             }
@@ -547,6 +549,15 @@ class LoginViewModel @AssistedInject constructor(
         })
     }
 
+    private fun onWellKnownError() {
+        setState {
+            copy(
+                    asyncLoginAction = Uninitialized
+            )
+        }
+        _viewEvents.post(LoginViewEvents.Failure(Exception(stringProvider.getString(R.string.autodiscover_well_known_error))))
+    }
+
     private fun onWellknownSuccess(action: LoginAction.LoginOrRegister,
                                    wellKnownPrompt: WellknownResult.Prompt,
                                    homeServerConnectionConfig: HomeServerConnectionConfig?) {

From e92cf38cde009e65c6ca05cc2d134d1230228e7e Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 31 Aug 2020 14:30:47 +0200
Subject: [PATCH 14/47] Add threePid: improve UX (remove dialog)

---
 .../app/features/form/FormEditTextItem.kt     | 19 +++-
 .../threepids/ThreePidsSettingsAction.kt      |  1 +
 .../threepids/ThreePidsSettingsController.kt  | 93 +++++++++++++------
 .../threepids/ThreePidsSettingsFragment.kt    | 51 ++++++----
 .../threepids/ThreePidsSettingsState.kt       | 23 +++++
 .../threepids/ThreePidsSettingsViewModel.kt   | 17 +++-
 .../threepids/ThreePidsSettingsViewState.kt   |  1 +
 .../main/res/layout/item_form_text_input.xml  |  1 +
 vector/src/main/res/values/strings.xml        |  1 -
 9 files changed, 153 insertions(+), 54 deletions(-)
 create mode 100644 vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsState.kt

diff --git a/vector/src/main/java/im/vector/app/features/form/FormEditTextItem.kt b/vector/src/main/java/im/vector/app/features/form/FormEditTextItem.kt
index f0c43228c1..12538d314a 100644
--- a/vector/src/main/java/im/vector/app/features/form/FormEditTextItem.kt
+++ b/vector/src/main/java/im/vector/app/features/form/FormEditTextItem.kt
@@ -17,6 +17,8 @@
 package im.vector.app.features.form
 
 import android.text.Editable
+import android.view.View
+import androidx.core.view.isVisible
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
 import com.google.android.material.textfield.TextInputEditText
@@ -35,9 +37,18 @@ abstract class FormEditTextItem : VectorEpoxyModel<FormEditTextItem.Holder>() {
     @EpoxyAttribute
     var value: String? = null
 
+    @EpoxyAttribute
+    var showBottomSeparator: Boolean = true
+
+    @EpoxyAttribute
+    var errorMessage: String? = null
+
     @EpoxyAttribute
     var enabled: Boolean = true
 
+    @EpoxyAttribute
+    var inputType: Int? = null
+
     @EpoxyAttribute
     var onTextChange: ((String) -> Unit)? = null
 
@@ -51,14 +62,17 @@ abstract class FormEditTextItem : VectorEpoxyModel<FormEditTextItem.Holder>() {
         super.bind(holder)
         holder.textInputLayout.isEnabled = enabled
         holder.textInputLayout.hint = hint
+        holder.textInputLayout.error = errorMessage
 
-        // Update only if text is different
-        if (holder.textInputEditText.text.toString() != value) {
+        // Update only if text is different and value is not null
+        if (value != null && holder.textInputEditText.text.toString() != value) {
             holder.textInputEditText.setText(value)
         }
         holder.textInputEditText.isEnabled = enabled
+        inputType?.let { holder.textInputEditText.inputType = it }
 
         holder.textInputEditText.addTextChangedListener(onTextChangeListener)
+        holder.bottomSeparator.isVisible = showBottomSeparator
     }
 
     override fun shouldSaveViewState(): Boolean {
@@ -73,5 +87,6 @@ abstract class FormEditTextItem : VectorEpoxyModel<FormEditTextItem.Holder>() {
     class Holder : VectorEpoxyHolder() {
         val textInputLayout by bind<TextInputLayout>(R.id.formTextInputTextInputLayout)
         val textInputEditText by bind<TextInputEditText>(R.id.formTextInputTextInputEditText)
+        val bottomSeparator by bind<View>(R.id.formTextInputDivider)
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsAction.kt b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsAction.kt
index c352bcfbda..1dac082b63 100644
--- a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsAction.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsAction.kt
@@ -20,6 +20,7 @@ import im.vector.app.core.platform.VectorViewModelAction
 import org.matrix.android.sdk.api.session.identity.ThreePid
 
 sealed class ThreePidsSettingsAction : VectorViewModelAction {
+    data class ChangeState(val newState: ThreePidsSettingsState) : ThreePidsSettingsAction()
     data class AddThreePid(val threePid: ThreePid) : ThreePidsSettingsAction()
     data class ContinueThreePid(val threePid: ThreePid) : ThreePidsSettingsAction()
     data class CancelThreePid(val threePid: ThreePid) : ThreePidsSettingsAction()
diff --git a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsController.kt b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsController.kt
index 9e77adafc9..cf3e66bc2a 100644
--- a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsController.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsController.kt
@@ -16,15 +16,15 @@
 
 package im.vector.app.features.settings.threepids
 
+import android.text.InputType
 import android.view.View
 import com.airbnb.epoxy.TypedEpoxyController
-import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.Fail
 import com.airbnb.mvrx.Loading
 import com.airbnb.mvrx.Success
 import im.vector.app.R
 import im.vector.app.core.epoxy.loadingItem
-import im.vector.app.core.epoxy.noResultItem
+import im.vector.app.core.extensions.exhaustive
 import im.vector.app.core.extensions.getFormattedValue
 import im.vector.app.core.resources.ColorProvider
 import im.vector.app.core.resources.StringProvider
@@ -33,6 +33,7 @@ import im.vector.app.core.ui.list.genericFooterItem
 import im.vector.app.features.discovery.settingsContinueCancelItem
 import im.vector.app.features.discovery.settingsInformationItem
 import im.vector.app.features.discovery.settingsSectionTitleItem
+import im.vector.app.features.form.formEditTextItem
 import org.matrix.android.sdk.api.session.identity.ThreePid
 import javax.inject.Inject
 
@@ -44,6 +45,9 @@ class ThreePidsSettingsController @Inject constructor(
     interface InteractionListener {
         fun addEmail()
         fun addMsisdn()
+        fun cancelAdding()
+        fun doAddEmail(email: String)
+        fun doAddMsisdn(msisdn: String)
         fun continueThreePid(threePid: ThreePid)
         fun cancelThreePid(threePid: ThreePid)
         fun deleteThreePid(threePid: ThreePid)
@@ -51,8 +55,15 @@ class ThreePidsSettingsController @Inject constructor(
 
     var interactionListener: InteractionListener? = null
 
+    private var currentInputValue = ""
+
     override fun buildModels(data: ThreePidsSettingsViewState?) {
         if (data == null) return
+
+        if (data.state is ThreePidsSettingsState.Idle) {
+            currentInputValue = ""
+        }
+
         when (data.threePids) {
             is Loading -> {
                 loadingItem {
@@ -68,12 +79,12 @@ class ThreePidsSettingsController @Inject constructor(
             }
             is Success -> {
                 val dataList = data.threePids.invoke()
-                buildThreePids(dataList, data.pendingThreePids)
+                buildThreePids(dataList, data)
             }
         }
     }
 
-    private fun buildThreePids(list: List<ThreePid>, pendingThreePids: Async<List<ThreePid>>) {
+    private fun buildThreePids(list: List<ThreePid>, data: ThreePidsSettingsViewState) {
         val splited = list.groupBy { it is ThreePid.Email }
         val emails = splited[true].orEmpty()
         val msisdn = splited[false].orEmpty()
@@ -86,16 +97,35 @@ class ThreePidsSettingsController @Inject constructor(
         emails.forEach { buildThreePid("email ", it) }
 
         // Pending threePids
-        pendingThreePids.invoke()
+        data.pendingThreePids.invoke()
                 ?.filterIsInstance(ThreePid.Email::class.java)
                 ?.forEach { buildPendingThreePid("p_email ", it) }
 
-        genericButtonItem {
-            id("addEmail")
-            text(stringProvider.getString(R.string.settings_add_email_address))
-            textColor(colorProvider.getColor(R.color.riotx_accent))
-            buttonClickAction(View.OnClickListener { interactionListener?.addEmail() })
-        }
+        when (data.state) {
+            ThreePidsSettingsState.Idle ->
+                genericButtonItem {
+                    id("addEmail")
+                    text(stringProvider.getString(R.string.settings_add_email_address))
+                    textColor(colorProvider.getColor(R.color.riotx_accent))
+                    buttonClickAction(View.OnClickListener { interactionListener?.addEmail() })
+                }
+            is ThreePidsSettingsState.AddingEmail -> {
+                formEditTextItem {
+                    id("addingEmail")
+                    inputType(InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS)
+                    hint(stringProvider.getString(R.string.medium_email))
+                    errorMessage(data.state.error)
+                    onTextChange { currentInputValue = it }
+                    showBottomSeparator(false)
+                }
+                settingsContinueCancelItem {
+                    id("contAddingEmail")
+                    continueOnClick { interactionListener?.doAddEmail(currentInputValue) }
+                    cancelOnClick { interactionListener?.cancelAdding() }
+                }
+            }
+            is ThreePidsSettingsState.AddingPhoneNumber -> Unit
+        }.exhaustive
 
         settingsSectionTitleItem {
             id("msisdn")
@@ -105,26 +135,35 @@ class ThreePidsSettingsController @Inject constructor(
         msisdn.forEach { buildThreePid("msisdn ", it) }
 
         // Pending threePids
-        pendingThreePids.invoke()
+        data.pendingThreePids.invoke()
                 ?.filterIsInstance(ThreePid.Msisdn::class.java)
                 ?.forEach { buildPendingThreePid("p_msisdn ", it) }
 
-        /*
-        // TODO Support adding MSISDN
-        genericButtonItem {
-            id("addMsisdn")
-            text(stringProvider.getString(R.string.settings_add_phone_number))
-            textColor(colorProvider.getColor(R.color.riotx_accent))
-            buttonClickAction(View.OnClickListener { interactionListener?.addMsisdn() })
-        }
-         */
-        // Avoid empty area
-        if (msisdn.isEmpty()) {
-            noResultItem {
-                id("no_msisdn")
-                text(stringProvider.getString(R.string.settings_phone_numbers_empty))
+        when (data.state) {
+            ThreePidsSettingsState.Idle ->
+                genericButtonItem {
+                    id("addMsisdn")
+                    text(stringProvider.getString(R.string.settings_add_phone_number))
+                    textColor(colorProvider.getColor(R.color.riotx_accent))
+                    buttonClickAction(View.OnClickListener { interactionListener?.addMsisdn() })
+                }
+            is ThreePidsSettingsState.AddingEmail -> Unit
+            is ThreePidsSettingsState.AddingPhoneNumber -> {
+                formEditTextItem {
+                    id("addingMsisdn")
+                    inputType(InputType.TYPE_CLASS_PHONE)
+                    hint(stringProvider.getString(R.string.medium_phone_number))
+                    errorMessage(data.state.error)
+                    onTextChange { currentInputValue = it }
+                    showBottomSeparator(false)
+                }
+                settingsContinueCancelItem {
+                    id("contAddingMsisdn")
+                    continueOnClick { interactionListener?.doAddMsisdn(currentInputValue) }
+                    cancelOnClick { interactionListener?.cancelAdding() }
+                }
             }
-        }
+        }.exhaustive
     }
 
     private fun buildThreePid(idPrefix: String, threePid: ThreePid) {
diff --git a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsFragment.kt b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsFragment.kt
index 1f95d78026..06ebf13b3b 100644
--- a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsFragment.kt
@@ -18,9 +18,7 @@ package im.vector.app.features.settings.threepids
 
 import android.content.DialogInterface
 import android.os.Bundle
-import android.text.InputType
 import android.view.View
-import android.widget.EditText
 import androidx.appcompat.app.AlertDialog
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
@@ -30,10 +28,11 @@ import im.vector.app.core.dialogs.withColoredButton
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
 import im.vector.app.core.extensions.exhaustive
+import im.vector.app.core.extensions.hideKeyboard
 import im.vector.app.core.extensions.isEmail
+import im.vector.app.core.platform.OnBackPressed
 import im.vector.app.core.platform.VectorBaseActivity
 import im.vector.app.core.platform.VectorBaseFragment
-import im.vector.app.core.utils.toast
 import kotlinx.android.synthetic.main.fragment_generic_recycler.*
 import org.matrix.android.sdk.api.session.identity.ThreePid
 import javax.inject.Inject
@@ -43,6 +42,7 @@ class ThreePidsSettingsFragment @Inject constructor(
         private val epoxyController: ThreePidsSettingsController
 ) :
         VectorBaseFragment(),
+        OnBackPressed,
         ThreePidsSettingsViewModel.Factory by viewModelFactory,
         ThreePidsSettingsController.InteractionListener {
 
@@ -90,27 +90,15 @@ class ThreePidsSettingsFragment @Inject constructor(
     }
 
     override fun addEmail() {
-        val inflater = requireActivity().layoutInflater
-        val layout = inflater.inflate(R.layout.dialog_base_edit_text, null)
-
-        val input = layout.findViewById<EditText>(R.id.editText)
-        input.inputType = InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS
-
-        AlertDialog.Builder(requireActivity())
-                .setTitle(R.string.settings_add_email_address)
-                .setView(layout)
-                .setPositiveButton(R.string.ok) { _, _ ->
-                    val email = input.text.toString()
-                    doAddEmail(email)
-                }
-                .setNegativeButton(R.string.cancel, null)
-                .show()
+        viewModel.handle(ThreePidsSettingsAction.ChangeState(ThreePidsSettingsState.AddingEmail(null)))
     }
 
-    private fun doAddEmail(email: String) {
+    override fun doAddEmail(email: String) {
+        viewModel.handle(ThreePidsSettingsAction.ChangeState(ThreePidsSettingsState.AddingEmail(null)))
+
         // Check that email is valid
         if (!email.isEmail()) {
-            requireActivity().toast(R.string.auth_invalid_email)
+            viewModel.handle(ThreePidsSettingsAction.ChangeState(ThreePidsSettingsState.AddingEmail(getString(R.string.auth_invalid_email))))
             return
         }
 
@@ -118,9 +106,21 @@ class ThreePidsSettingsFragment @Inject constructor(
     }
 
     override fun addMsisdn() {
+        viewModel.handle(ThreePidsSettingsAction.ChangeState(ThreePidsSettingsState.AddingPhoneNumber(null)))
+    }
+
+    override fun doAddMsisdn(msisdn: String) {
+        viewModel.handle(ThreePidsSettingsAction.ChangeState(ThreePidsSettingsState.AddingPhoneNumber(null)))
+
         TODO("Not yet implemented")
     }
 
+    override fun cancelAdding() {
+        viewModel.handle(ThreePidsSettingsAction.ChangeState(ThreePidsSettingsState.Idle))
+        // Hide the keyboard
+        view?.hideKeyboard()
+    }
+
     override fun continueThreePid(threePid: ThreePid) {
         viewModel.handle(ThreePidsSettingsAction.ContinueThreePid(threePid))
     }
@@ -139,4 +139,15 @@ class ThreePidsSettingsFragment @Inject constructor(
                 .show()
                 .withColoredButton(DialogInterface.BUTTON_POSITIVE)
     }
+
+    override fun onBackPressed(toolbarButton: Boolean): Boolean {
+        return withState(viewModel) {
+            if (it.state is ThreePidsSettingsState.Idle) {
+                false
+            } else {
+                cancelAdding()
+                true
+            }
+        }
+    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsState.kt b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsState.kt
new file mode 100644
index 0000000000..32a685b697
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsState.kt
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.settings.threepids
+
+sealed class ThreePidsSettingsState {
+    object Idle : ThreePidsSettingsState()
+    data class AddingEmail(val error: String?) : ThreePidsSettingsState()
+    data class AddingPhoneNumber(val error: String?) : ThreePidsSettingsState()
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewModel.kt
index 00a58f0610..ece17547e6 100644
--- a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewModel.kt
@@ -129,14 +129,23 @@ class ThreePidsSettingsViewModel @AssistedInject constructor(
 
     override fun handle(action: ThreePidsSettingsAction) {
         when (action) {
-            is ThreePidsSettingsAction.AddThreePid      -> handleAddThreePid(action)
+            is ThreePidsSettingsAction.AddThreePid -> handleAddThreePid(action)
             is ThreePidsSettingsAction.ContinueThreePid -> handleContinueThreePid(action)
-            is ThreePidsSettingsAction.CancelThreePid   -> handleCancelThreePid(action)
-            is ThreePidsSettingsAction.AccountPassword  -> handleAccountPassword(action)
-            is ThreePidsSettingsAction.DeleteThreePid   -> handleDeleteThreePid(action)
+            is ThreePidsSettingsAction.CancelThreePid -> handleCancelThreePid(action)
+            is ThreePidsSettingsAction.AccountPassword -> handleAccountPassword(action)
+            is ThreePidsSettingsAction.DeleteThreePid -> handleDeleteThreePid(action)
+            is ThreePidsSettingsAction.ChangeState -> handleChangeState(action)
         }.exhaustive
     }
 
+    private fun handleChangeState(action: ThreePidsSettingsAction.ChangeState) {
+        setState {
+            copy(
+                    state = action.newState
+            )
+        }
+    }
+
     private fun handleAddThreePid(action: ThreePidsSettingsAction.AddThreePid) {
         isLoading(true)
 
diff --git a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewState.kt b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewState.kt
index 10ac51f229..47590286e0 100644
--- a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewState.kt
@@ -22,6 +22,7 @@ import com.airbnb.mvrx.Uninitialized
 import org.matrix.android.sdk.api.session.identity.ThreePid
 
 data class ThreePidsSettingsViewState(
+        val state: ThreePidsSettingsState = ThreePidsSettingsState.Idle,
         val isLoading: Boolean = false,
         val threePids: Async<List<ThreePid>> = Uninitialized,
         val pendingThreePids: Async<List<ThreePid>> = Uninitialized
diff --git a/vector/src/main/res/layout/item_form_text_input.xml b/vector/src/main/res/layout/item_form_text_input.xml
index 775489c5d9..594bfc1788 100644
--- a/vector/src/main/res/layout/item_form_text_input.xml
+++ b/vector/src/main/res/layout/item_form_text_input.xml
@@ -14,6 +14,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
         android:layout_marginEnd="@dimen/layout_horizontal_margin"
+        app:errorEnabled="true"
         app:layout_constraintBottom_toTopOf="@+id/formTextInputDivider"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 553dc1674e..43a2f73947 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -684,7 +684,6 @@
 
     <string name="settings_emails">Email addresses</string>
     <string name="settings_phone_numbers">Phone numbers</string>
-    <string name="settings_phone_numbers_empty">No phone number has been added to your account</string>
     <string name="settings_remove_three_pid_confirmation_content">Remove %s?</string>
     <string name="error_threepid_auth_failed">Ensure that you have clicked on the link in the email we have sent to you.</string>
 

From ee3e10a4b019defced04ef9f9c42094852c7f313 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 31 Aug 2020 14:46:05 +0200
Subject: [PATCH 15/47] Add threePid: improve UI for phone numbers

---
 .../threepids/ThreePidsSettingsController.kt    |  5 +++++
 .../threepids/ThreePidsSettingsFragment.kt      | 17 ++++++++++++++---
 .../threepids/ThreePidsSettingsViewModel.kt     | 16 +++++++++++++++-
 vector/src/main/res/values/strings.xml          |  1 +
 4 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsController.kt b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsController.kt
index cf3e66bc2a..e8321ad456 100644
--- a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsController.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsController.kt
@@ -31,6 +31,7 @@ import im.vector.app.core.resources.StringProvider
 import im.vector.app.core.ui.list.genericButtonItem
 import im.vector.app.core.ui.list.genericFooterItem
 import im.vector.app.features.discovery.settingsContinueCancelItem
+import im.vector.app.features.discovery.settingsInfoItem
 import im.vector.app.features.discovery.settingsInformationItem
 import im.vector.app.features.discovery.settingsSectionTitleItem
 import im.vector.app.features.form.formEditTextItem
@@ -149,6 +150,10 @@ class ThreePidsSettingsController @Inject constructor(
                 }
             is ThreePidsSettingsState.AddingEmail -> Unit
             is ThreePidsSettingsState.AddingPhoneNumber -> {
+                settingsInfoItem {
+                    id("addingMsisdnInfo")
+                    helperText(stringProvider.getString(R.string.login_msisdn_notice))
+                }
                 formEditTextItem {
                     id("addingMsisdn")
                     inputType(InputType.TYPE_CLASS_PHONE)
diff --git a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsFragment.kt b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsFragment.kt
index 06ebf13b3b..27844f0c22 100644
--- a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsFragment.kt
@@ -94,15 +94,17 @@ class ThreePidsSettingsFragment @Inject constructor(
     }
 
     override fun doAddEmail(email: String) {
+        // Sanity
+        val safeEmail = email.trim().replace(" ", "")
         viewModel.handle(ThreePidsSettingsAction.ChangeState(ThreePidsSettingsState.AddingEmail(null)))
 
         // Check that email is valid
-        if (!email.isEmail()) {
+        if (!safeEmail.isEmail()) {
             viewModel.handle(ThreePidsSettingsAction.ChangeState(ThreePidsSettingsState.AddingEmail(getString(R.string.auth_invalid_email))))
             return
         }
 
-        viewModel.handle(ThreePidsSettingsAction.AddThreePid(ThreePid.Email(email)))
+        viewModel.handle(ThreePidsSettingsAction.AddThreePid(ThreePid.Email(safeEmail)))
     }
 
     override fun addMsisdn() {
@@ -110,9 +112,18 @@ class ThreePidsSettingsFragment @Inject constructor(
     }
 
     override fun doAddMsisdn(msisdn: String) {
+        // Sanity
+        val safeMsisdn = msisdn.trim().replace(" ", "")
+
         viewModel.handle(ThreePidsSettingsAction.ChangeState(ThreePidsSettingsState.AddingPhoneNumber(null)))
 
-        TODO("Not yet implemented")
+        // Check that phone number is valid
+        if (!msisdn.startsWith("+")) {
+            viewModel.handle(ThreePidsSettingsAction.ChangeState(ThreePidsSettingsState.AddingPhoneNumber(getString(R.string.login_msisdn_error_not_international))))
+            return
+        }
+
+        viewModel.handle(ThreePidsSettingsAction.AddThreePid(ThreePid.Msisdn(safeMsisdn)))
     }
 
     override fun cancelAdding() {
diff --git a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewModel.kt
index ece17547e6..f0bb0e9e41 100644
--- a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewModel.kt
@@ -155,7 +155,21 @@ class ThreePidsSettingsViewModel @AssistedInject constructor(
                 _viewEvents.post(ThreePidsSettingsViewEvents.Failure(IllegalArgumentException(stringProvider.getString(R.string.auth_email_already_defined))))
             } else {
                 viewModelScope.launch {
-                    session.addThreePid(action.threePid, loadingCallback)
+                    session.addThreePid(action.threePid, object : MatrixCallback<Unit> {
+                        override fun onSuccess(data: Unit) {
+                            // Also reset the state
+                            setState {
+                                copy(
+                                        state = ThreePidsSettingsState.Idle
+                                )
+                            }
+                            loadingCallback.onSuccess(data)
+                        }
+
+                        override fun onFailure(failure: Throwable) {
+                            loadingCallback.onFailure(failure)
+                        }
+                    })
                 }
             }
         }
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 43a2f73947..975525c750 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -1951,6 +1951,7 @@
     <string name="login_msisdn_confirm_send_again">Send again</string>
     <string name="login_msisdn_confirm_submit">Next</string>
 
+    <string name="login_msisdn_notice">"Please use the international format (phone number must start with '+')"</string>
     <string name="login_msisdn_error_not_international">"International phone numbers must start with '+'"</string>
     <string name="login_msisdn_error_other">"Phone number seems invalid. Please check it"</string>
 

From 3c3c51e6fd3adf3f3ebdd5e15e0ceb44468021a4 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 31 Aug 2020 14:48:48 +0200
Subject: [PATCH 16/47] Doc: more generic to handle MSISDN

---
 docs/{add_email.md => add_threePids.md} | 30 +++++++++++++------------
 1 file changed, 16 insertions(+), 14 deletions(-)
 rename docs/{add_email.md => add_threePids.md} (82%)

diff --git a/docs/add_email.md b/docs/add_threePids.md
similarity index 82%
rename from docs/add_email.md
rename to docs/add_threePids.md
index 2eb112fe79..2d5850b21d 100644
--- a/docs/add_email.md
+++ b/docs/add_threePids.md
@@ -1,6 +1,8 @@
-# Adding an email to an account
+# Adding and removing ThreePids to an account
 
-## User enter the email
+## Add email
+
+### User enter the email
 
 > POST https://homeserver.org/_matrix/client/r0/account/3pid/email/requestToken
 
@@ -12,7 +14,7 @@
 }
 ```
 
-### The email is already added to an account
+#### The email is already added to an account
 
 400
 
@@ -23,7 +25,7 @@
 }
 ```
 
-### The email is free
+#### The email is free
 
 Wording: "We've sent you an email to verify your address. Please follow the instructions there and then click the button below."
 
@@ -44,13 +46,13 @@ Wording: "We've sent you an email to verify your address. Please follow the inst
 >  
 >  If this was not you, you can safely ignore this email. Thank you.
 
-## User clicks on the link
+### User clicks on the link
 
 The browser displays the following message:
 
 > Your email has now been validated, please return to your client. You may now close this window.
 
-## User returns on Element
+### User returns on Element
 
 User clicks on CONTINUE
 
@@ -80,7 +82,7 @@ User clicks on CONTINUE
 }
 ```
 
-## User enters his password
+### User enters his password
 
 POST https://homeserver.org/_matrix/client/r0/account/3pid/add
 
@@ -97,7 +99,7 @@ POST https://homeserver.org/_matrix/client/r0/account/3pid/add
 }
 ```
 
-### The link has not been clicked
+#### The link has not been clicked
 
 400
 
@@ -108,7 +110,7 @@ POST https://homeserver.org/_matrix/client/r0/account/3pid/add
 }
 ```
 
-### Wrong password
+#### Wrong password
 
 401
 
@@ -131,7 +133,7 @@ POST https://homeserver.org/_matrix/client/r0/account/3pid/add
 }
 ```
 
-### The link has been clicked and the account password is correct
+#### The link has been clicked and the account password is correct
 
 200
 
@@ -139,9 +141,9 @@ POST https://homeserver.org/_matrix/client/r0/account/3pid/add
 {}
 ```
 
-# Remove email
+## Remove email
 
-## User want to remove the email from his account
+### User want to remove the email from his account
 
 > POST https://homeserver.org/_matrix/client/r0/account/3pid/delete
 
@@ -152,7 +154,7 @@ POST https://homeserver.org/_matrix/client/r0/account/3pid/add
 }
 ```
 
-### Email was not bound to an identity server
+#### Email was not bound to an identity server
 
 200
 
@@ -162,7 +164,7 @@ POST https://homeserver.org/_matrix/client/r0/account/3pid/add
 }
 ```
 
-### Email was bound to an identity server
+#### Email was bound to an identity server
 
 200
 

From 5a2124902221dccbf7914ad69c230aadbfb41a49 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 31 Aug 2020 15:08:59 +0200
Subject: [PATCH 17/47] Doc: Adding MSISDN

---
 docs/add_threePids.md | 112 +++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 111 insertions(+), 1 deletion(-)

diff --git a/docs/add_threePids.md b/docs/add_threePids.md
index 2d5850b21d..98fcbbda6a 100644
--- a/docs/add_threePids.md
+++ b/docs/add_threePids.md
@@ -143,7 +143,7 @@ POST https://homeserver.org/_matrix/client/r0/account/3pid/add
 
 ## Remove email
 
-### User want to remove the email from his account
+### User want to remove an email from his account
 
 > POST https://homeserver.org/_matrix/client/r0/account/3pid/delete
 
@@ -173,3 +173,113 @@ POST https://homeserver.org/_matrix/client/r0/account/3pid/add
   "id_server_unbind_result": "success"
 }
 ```
+
+## Add phone number
+
+> POST https://homeserver.org/_matrix/client/r0/account/3pid/msisdn/requestToken
+
+```json
+{
+  "country": "FR",
+  "phone_number": "611223344",
+  "client_secret": "f1K29wFZBEr4RZYatu7xj8nEbXiVpr7J",
+  "send_attempt": 1
+}
+```
+
+Note that the phone number is sent without `+` and without the country code
+
+#### The phone number is already added to an account
+
+400
+
+```json
+{
+  "errcode": "M_THREEPID_IN_USE",
+  "error": "MSISDN is already in use"
+}
+```
+
+#### The phone number is free
+
+Wording: "A text message has been sent to +33611223344. Please enter the verification code it contains."
+
+200
+
+```json
+{
+  "msisdn": "33651547677",
+  "intl_fmt": "+33 6 51 54 76 77",
+  "success": true,
+  "sid": "253299954",
+  "submit_url": "https://homeserver.org/_matrix/client/unstable/add_threepid/msisdn/submit_token"
+}
+```
+
+## User receive a text message
+
+> Riot
+
+> Your Riot validation code is 892541, please enter this into the app
+
+### User enter the code to the app
+
+#### Wrong code
+
+> POST https://homeserver.org/_matrix/client/unstable/add_threepid/msisdn/submit_token
+
+```json
+{
+  "sid": "253299954",
+  "client_secret": "f1K29wFZBEr4RZYatu7xj8nEbXiVpr7J",
+  "token": "111111"
+}
+```
+
+400
+
+```json
+{
+  "errcode": "M_UNKNOWN",
+  "error": "Error contacting the identity server"
+}
+```
+
+This is not an ideal, but the client will display a hint to check the entered code to the user.
+
+#### Correct code
+
+> POST https://homeserver.org/_matrix/client/unstable/add_threepid/msisdn/submit_token
+
+```json
+{
+  "sid": "253299954",
+  "client_secret": "f1K29wFZBEr4RZYatu7xj8nEbXiVpr7J",
+  "token": "892541"
+}
+```
+
+200
+
+````json
+{
+  "success": true
+}
+````
+
+Then the app call `https://homeserver.org/_matrix/client/r0/account/3pid/add` as per adding an email and follow the same UIS flow
+
+## Remove phone number
+
+### User wants to remove a phone number from his account
+
+This is the same request and response than to remove email, but with this body:
+
+```json
+{
+  "medium": "msisdn",
+  "address": "33611223344"
+}
+```
+
+Note that the phone number is provided without `+`, but with the country code.

From e309b302035cceeebe5e0dfde70dfb10a9e5f957 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 31 Aug 2020 16:16:18 +0200
Subject: [PATCH 18/47] Implement: Adding MSISDN (WIP)

---
 .../database/RealmSessionStoreMigration.kt    |  1 +
 .../database/model/PendingThreePidEntity.kt   |  3 +-
 ...hreePidResponse.kt => AddEmailResponse.kt} |  2 +-
 .../internal/session/profile/AddMsisdnBody.kt | 54 ++++++++++++++
 .../session/profile/AddMsisdnResponse.kt      | 55 ++++++++++++++
 .../session/profile/AddThreePidTask.kt        | 72 +++++++++++++++----
 .../session/profile/PendingThreePid.kt        |  5 +-
 .../session/profile/PendingThreePidMapper.kt  |  6 +-
 .../internal/session/profile/ProfileAPI.kt    |  8 ++-
 .../threepids/ThreePidsSettingsFragment.kt    |  6 ++
 10 files changed, 193 insertions(+), 19 deletions(-)
 rename matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/{AddThreePidResponse.kt => AddEmailResponse.kt} (96%)
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddMsisdnBody.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddMsisdnResponse.kt

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
index 00c4fdac84..e410e4cfa6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
@@ -77,5 +77,6 @@ class RealmSessionStoreMigration @Inject constructor() : RealmMigration {
                 .setRequired(PendingThreePidEntityFields.SEND_ATTEMPT, true)
                 .addField(PendingThreePidEntityFields.SID, String::class.java)
                 .setRequired(PendingThreePidEntityFields.SID, true)
+                .addField(PendingThreePidEntityFields.SUBMIT_URL, String::class.java)
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PendingThreePidEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PendingThreePidEntity.kt
index bf2f11dedd..2f5643d7bc 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PendingThreePidEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PendingThreePidEntity.kt
@@ -27,5 +27,6 @@ internal open class PendingThreePidEntity(
         var msisdn: String? = null,
         var clientSecret: String = "",
         var sendAttempt: Int = 0,
-        var sid: String = ""
+        var sid: String = "",
+        var submitUrl: String? = null
 ) : RealmObject()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddThreePidResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddEmailResponse.kt
similarity index 96%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddThreePidResponse.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddEmailResponse.kt
index 109b3d5343..8654d7c5ba 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddThreePidResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddEmailResponse.kt
@@ -20,7 +20,7 @@ import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 
 @JsonClass(generateAdapter = true)
-internal data class AddThreePidResponse(
+internal data class AddEmailResponse(
         /**
          * Required. The session ID. Session IDs are opaque strings that must consist entirely
          * of the characters [0-9a-zA-Z.=_-]. Their length must not exceed 255 characters and they must not be empty.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddMsisdnBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddMsisdnBody.kt
new file mode 100644
index 0000000000..64c53f6729
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddMsisdnBody.kt
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.matrix.android.sdk.internal.session.profile
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+internal data class AddMsisdnBody(
+        /**
+         * Required. A unique string generated by the client, and used to identify the validation attempt.
+         * It must be a string consisting of the characters [0-9a-zA-Z.=_-]. Its length must not exceed
+         * 255 characters and it must not be empty.
+         */
+        @Json(name = "client_secret")
+        val clientSecret: String,
+
+        /**
+         * Required. The two-letter uppercase ISO-3166-1 alpha-2 country code that the number in
+         * phone_number should be parsed as if it were dialled from.
+         */
+        @Json(name = "country")
+        val country: String,
+
+        /**
+         * Required. The phone number to validate.
+         */
+        @Json(name = "phone_number")
+        val phoneNumber: String,
+
+        /**
+         * Required. The server will only send an SMS if the send_attempt is a number greater than the most
+         * recent one which it has seen, scoped to that country + phone_number + client_secret triple. This
+         * is to avoid repeatedly sending the same SMS in the case of request retries between the POSTing user
+         * and the identity server. The client should increment this value if they desire a new SMS (e.g. a
+         * reminder) to be sent.
+         */
+        @Json(name = "send_attempt")
+        val sendAttempt: Int
+)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddMsisdnResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddMsisdnResponse.kt
new file mode 100644
index 0000000000..b4c137b3a1
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddMsisdnResponse.kt
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.profile
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+internal data class AddMsisdnResponse(
+        /**
+         * Required. The session ID. Session IDs are opaque strings that must consist entirely of the characters [0-9a-zA-Z.=_-].
+         * Their length must not exceed 255 characters and they must not be empty.
+         */
+        @Json(name = "sid")
+        val sid: String,
+
+        /**
+         * An optional field containing a URL where the client must submit the validation token to, with identical parameters to the Identity
+         * Service API's POST /validate/email/submitToken endpoint (without the requirement for an access token).
+         * The homeserver must send this token to the user (if applicable), who should then be prompted to provide it to the client.
+         *
+         * If this field is not present, the client can assume that verification will happen without the client's involvement provided
+         * the homeserver advertises this specification version in the /versions response (ie: r0.5.0).
+         */
+        @Json(name = "submit_url")
+        val submitUrl: String? = null,
+
+        /* ==========================================================================================
+         * It seems that the homeserver is sending more data, we may need it
+         * ========================================================================================== */
+
+        @Json(name = "msisdn")
+        val msisdn: String? = null,
+
+        @Json(name = "intl_fmt")
+        val formattedMsisdn: String? = null,
+
+        @Json(name = "success")
+        val success: Boolean? = null
+)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddThreePidTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddThreePidTask.kt
index 75c829c785..5b24961a49 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddThreePidTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddThreePidTask.kt
@@ -17,6 +17,7 @@
 
 package org.matrix.android.sdk.internal.session.profile
 
+import com.google.i18n.phonenumbers.PhoneNumberUtil
 import com.zhuinden.monarchy.Monarchy
 import org.greenrobot.eventbus.EventBus
 import org.matrix.android.sdk.api.session.identity.ThreePid
@@ -40,31 +41,76 @@ internal class DefaultAddThreePidTask @Inject constructor(
         private val eventBus: EventBus) : AddThreePidTask() {
 
     override suspend fun execute(params: Params) {
+        when (params.threePid) {
+            is ThreePid.Email -> addEmail(params.threePid)
+            is ThreePid.Msisdn -> addMsisdn(params.threePid)
+        }
+    }
+
+    private suspend fun addEmail(threePid: ThreePid.Email) {
         val clientSecret = UUID.randomUUID().toString()
         val sendAttempt = 1
-        val result = when (params.threePid) {
-            is ThreePid.Email ->
-                executeRequest<AddThreePidResponse>(eventBus) {
-                    val body = AddEmailBody(
-                            email = params.threePid.email,
-                            sendAttempt = sendAttempt,
-                            clientSecret = clientSecret
-                    )
-                    apiCall = profileAPI.addEmail(body)
-                }
-            is ThreePid.Msisdn -> TODO()
+
+        val result = executeRequest<AddEmailResponse>(eventBus) {
+            val body = AddEmailBody(
+                    clientSecret = clientSecret,
+                    email = threePid.email,
+                    sendAttempt = sendAttempt
+            )
+            apiCall = profileAPI.addEmail(body)
         }
 
         // Store as a pending three pid
         monarchy.awaitTransaction { realm ->
             PendingThreePid(
-                    threePid = params.threePid,
+                    threePid = threePid,
                     clientSecret = clientSecret,
                     sendAttempt = sendAttempt,
-                    sid = result.sid
+                    sid = result.sid,
+                    submitUrl = null
             )
                     .let { pendingThreePidMapper.map(it) }
                     .let { realm.copyToRealm(it) }
         }
     }
+
+    private suspend fun addMsisdn(threePid: ThreePid.Msisdn) {
+        val clientSecret = UUID.randomUUID().toString()
+        val sendAttempt = 1
+
+        // Get country code from the phone number
+        val phoneNumber = threePid.msisdn
+
+        val parsedNumber = PhoneNumberUtil.getInstance().parse(phoneNumber, null)
+        val countryCode = parsedNumber.countryCode
+
+        val result = executeRequest<AddMsisdnResponse>(eventBus) {
+            val body = AddMsisdnBody(
+                    clientSecret = clientSecret,
+                    country = countryCode.asString(), // TODO Convert to String,
+                    phoneNumber = parsedNumber.nationalNumber.toString(),
+                    sendAttempt = sendAttempt
+            )
+            apiCall = profileAPI.addMsisdn(body)
+        }
+
+        // Store as a pending three pid
+        monarchy.awaitTransaction { realm ->
+            PendingThreePid(
+                    threePid = threePid,
+                    clientSecret = clientSecret,
+                    sendAttempt = sendAttempt,
+                    sid = result.sid,
+                    submitUrl = result.submitUrl
+            )
+                    .let { pendingThreePidMapper.map(it) }
+                    .let { realm.copyToRealm(it) }
+        }
+    }
+
+    private fun Int.asString(): String {
+        // TODO
+        return ""
+    }
 }
+
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/PendingThreePid.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/PendingThreePid.kt
index d9c3a5d656..ea3d0f1ee8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/PendingThreePid.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/PendingThreePid.kt
@@ -22,6 +22,9 @@ internal data class PendingThreePid(
         val threePid: ThreePid,
         val clientSecret: String,
         val sendAttempt: Int,
-        val sid: String
+        // For Msisdn and Email
+        val sid: String,
+        // For Msisdn only
+        val submitUrl: String?
 )
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/PendingThreePidMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/PendingThreePidMapper.kt
index c9d6381bd3..b1877027ed 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/PendingThreePidMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/PendingThreePidMapper.kt
@@ -29,7 +29,8 @@ internal class PendingThreePidMapper @Inject constructor() {
                         ?: error("Invalid data"),
                 clientSecret = entity.clientSecret,
                 sendAttempt = entity.sendAttempt,
-                sid = entity.sid
+                sid = entity.sid,
+                submitUrl = entity.submitUrl
         )
     }
 
@@ -39,7 +40,8 @@ internal class PendingThreePidMapper @Inject constructor() {
                 msisdn = domain.threePid.takeIf { it is ThreePid.Msisdn }?.value,
                 clientSecret = domain.clientSecret,
                 sendAttempt = domain.sendAttempt,
-                sid = domain.sid
+                sid = domain.sid,
+                submitUrl = domain.submitUrl
         )
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ProfileAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ProfileAPI.kt
index 125b1a47e6..cfd965e23f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ProfileAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ProfileAPI.kt
@@ -75,7 +75,13 @@ internal interface ProfileAPI {
      * Ref: https://matrix.org/docs/spec/client_server/r0.6.1#post-matrix-client-r0-account-3pid-email-requesttoken
      */
     @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "account/3pid/email/requestToken")
-    fun addEmail(@Body body: AddEmailBody): Call<AddThreePidResponse>
+    fun addEmail(@Body body: AddEmailBody): Call<AddEmailResponse>
+
+    /**
+     * Ref: https://matrix.org/docs/spec/client_server/r0.6.1#post-matrix-client-r0-account-3pid-msisdn-requesttoken
+     */
+    @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "account/3pid/msisdn/requestToken")
+    fun addMsisdn(@Body body: AddMsisdnBody): Call<AddMsisdnResponse>
 
     /**
      * Ref: https://matrix.org/docs/spec/client_server/r0.6.1#post-matrix-client-r0-account-3pid-add
diff --git a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsFragment.kt b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsFragment.kt
index 27844f0c22..8ca506e819 100644
--- a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsFragment.kt
@@ -30,6 +30,7 @@ import im.vector.app.core.extensions.configureWith
 import im.vector.app.core.extensions.exhaustive
 import im.vector.app.core.extensions.hideKeyboard
 import im.vector.app.core.extensions.isEmail
+import im.vector.app.core.extensions.isMsisdn
 import im.vector.app.core.platform.OnBackPressed
 import im.vector.app.core.platform.VectorBaseActivity
 import im.vector.app.core.platform.VectorBaseFragment
@@ -123,6 +124,11 @@ class ThreePidsSettingsFragment @Inject constructor(
             return
         }
 
+        if (!msisdn.isMsisdn()) {
+            viewModel.handle(ThreePidsSettingsAction.ChangeState(ThreePidsSettingsState.AddingPhoneNumber(getString(R.string.login_msisdn_error_other))))
+            return
+        }
+
         viewModel.handle(ThreePidsSettingsAction.AddThreePid(ThreePid.Msisdn(safeMsisdn)))
     }
 

From bd12c89a3c8578c5e2e59b07d42dc8cafd4f42da Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 31 Aug 2020 16:29:34 +0200
Subject: [PATCH 19/47] Move the DB version number to the Migration class, I
 think it has more sense. Also increase the value.

---
 .../internal/database/RealmSessionStoreMigration.kt    |  4 ++++
 .../database/SessionRealmConfigurationFactory.kt       | 10 +++-------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
index e410e4cfa6..ca309cc444 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
@@ -27,6 +27,10 @@ import javax.inject.Inject
 
 class RealmSessionStoreMigration @Inject constructor() : RealmMigration {
 
+    companion object {
+        const val SESSION_STORE_SCHEMA_VERSION = 4L
+    }
+
     override fun migrate(realm: DynamicRealm, oldVersion: Long, newVersion: Long) {
         Timber.v("Migrating Realm Session from $oldVersion to $newVersion")
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/SessionRealmConfigurationFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/SessionRealmConfigurationFactory.kt
index 456eecc54a..8dde1e9579 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/SessionRealmConfigurationFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/SessionRealmConfigurationFactory.kt
@@ -19,13 +19,13 @@ package org.matrix.android.sdk.internal.database
 
 import android.content.Context
 import androidx.core.content.edit
+import io.realm.Realm
+import io.realm.RealmConfiguration
 import org.matrix.android.sdk.internal.database.model.SessionRealmModule
 import org.matrix.android.sdk.internal.di.SessionFilesDirectory
 import org.matrix.android.sdk.internal.di.SessionId
 import org.matrix.android.sdk.internal.di.UserMd5
 import org.matrix.android.sdk.internal.session.SessionModule
-import io.realm.Realm
-import io.realm.RealmConfiguration
 import timber.log.Timber
 import java.io.File
 import javax.inject.Inject
@@ -46,10 +46,6 @@ internal class SessionRealmConfigurationFactory @Inject constructor(
         val migration: RealmSessionStoreMigration,
         context: Context) {
 
-    companion object {
-        const val SESSION_STORE_SCHEMA_VERSION = 3L
-    }
-
     // Keep legacy preferences name for compatibility reason
     private val sharedPreferences = context.getSharedPreferences("im.vector.matrix.android.realm", Context.MODE_PRIVATE)
 
@@ -74,7 +70,7 @@ internal class SessionRealmConfigurationFactory @Inject constructor(
                     realmKeysUtils.configureEncryption(this, SessionModule.getKeyAlias(userMd5))
                 }
                 .modules(SessionRealmModule())
-                .schemaVersion(SESSION_STORE_SCHEMA_VERSION)
+                .schemaVersion(RealmSessionStoreMigration.SESSION_STORE_SCHEMA_VERSION)
                 .migration(migration)
                 .build()
 

From 9c05efa15d3082da95afc77ab47840a9996666f8 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 31 Aug 2020 16:46:56 +0200
Subject: [PATCH 20/47] Fix migration issue. Also do not delete Realm file in
 case of migration issue when debugging.

---
 .../auth/registration/DefaultRegistrationWizard.kt |  8 ++++----
 .../database/RealmSessionStoreMigration.kt         |  1 -
 .../database/SessionRealmConfigurationFactory.kt   | 14 ++++++++++----
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt
index 79b71b208e..676f40a918 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt
@@ -17,6 +17,9 @@
 
 package org.matrix.android.sdk.internal.auth.registration
 
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.delay
+import okhttp3.OkHttpClient
 import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.auth.data.LoginFlowTypes
 import org.matrix.android.sdk.api.auth.registration.RegisterThreePid
@@ -33,9 +36,6 @@ import org.matrix.android.sdk.internal.auth.db.PendingSessionData
 import org.matrix.android.sdk.internal.network.RetrofitFactory
 import org.matrix.android.sdk.internal.task.launchToCallback
 import org.matrix.android.sdk.internal.util.MatrixCoroutineDispatchers
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.delay
-import okhttp3.OkHttpClient
 
 /**
  * This class execute the registration request and is responsible to keep the session of interactive authentication
@@ -193,7 +193,7 @@ internal class DefaultRegistrationWizard(
         val registrationParams = pendingSessionData.currentThreePidData?.registrationParams
                 ?: throw IllegalStateException("developer error, no pending three pid")
         val safeCurrentData = pendingSessionData.currentThreePidData ?: throw IllegalStateException("developer error, call createAccount() method first")
-        val url = safeCurrentData.addThreePidRegistrationResponse.submitUrl ?: throw IllegalStateException("Missing url the send the code")
+        val url = safeCurrentData.addThreePidRegistrationResponse.submitUrl ?: throw IllegalStateException("Missing url to send the code")
         val validationBody = ValidationCodeBody(
                 clientSecret = pendingSessionData.clientSecret,
                 sid = safeCurrentData.addThreePidRegistrationResponse.sid,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
index ca309cc444..ad05406aa0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
@@ -78,7 +78,6 @@ class RealmSessionStoreMigration @Inject constructor() : RealmMigration {
                 .addField(PendingThreePidEntityFields.EMAIL, String::class.java)
                 .addField(PendingThreePidEntityFields.MSISDN, String::class.java)
                 .addField(PendingThreePidEntityFields.SEND_ATTEMPT, Int::class.java)
-                .setRequired(PendingThreePidEntityFields.SEND_ATTEMPT, true)
                 .addField(PendingThreePidEntityFields.SID, String::class.java)
                 .setRequired(PendingThreePidEntityFields.SID, true)
                 .addField(PendingThreePidEntityFields.SUBMIT_URL, String::class.java)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/SessionRealmConfigurationFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/SessionRealmConfigurationFactory.kt
index 8dde1e9579..d5c259050f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/SessionRealmConfigurationFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/SessionRealmConfigurationFactory.kt
@@ -21,6 +21,7 @@ import android.content.Context
 import androidx.core.content.edit
 import io.realm.Realm
 import io.realm.RealmConfiguration
+import org.matrix.android.sdk.BuildConfig
 import org.matrix.android.sdk.internal.database.model.SessionRealmModule
 import org.matrix.android.sdk.internal.di.SessionFilesDirectory
 import org.matrix.android.sdk.internal.di.SessionId
@@ -52,10 +53,10 @@ internal class SessionRealmConfigurationFactory @Inject constructor(
     fun create(): RealmConfiguration {
         val shouldClearRealm = sharedPreferences.getBoolean("$REALM_SHOULD_CLEAR_FLAG_$sessionId", false)
         if (shouldClearRealm) {
-            Timber.v("************************************************************")
-            Timber.v("The realm file session was corrupted and couldn't be loaded.")
-            Timber.v("The file has been deleted to recover.")
-            Timber.v("************************************************************")
+            Timber.e("************************************************************")
+            Timber.e("The realm file session was corrupted and couldn't be loaded.")
+            Timber.e("The file has been deleted to recover.")
+            Timber.e("************************************************************")
             deleteRealmFiles()
         }
         sharedPreferences.edit {
@@ -86,6 +87,11 @@ internal class SessionRealmConfigurationFactory @Inject constructor(
 
     // Delete all the realm files of the session
     private fun deleteRealmFiles() {
+        if (BuildConfig.DEBUG) {
+            Timber.e("No op because it is a debug build")
+            return
+        }
+
         listOf(REALM_NAME, "$REALM_NAME.lock", "$REALM_NAME.note", "$REALM_NAME.management").forEach { file ->
             try {
                 File(directory, file).deleteRecursively()

From f34c5d6674f5c97c6a888f35e617a9c4dae66929 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Mon, 31 Aug 2020 17:50:17 +0200
Subject: [PATCH 21/47] Crash / Attachment viewer: Cannot draw a recycled
 Bitmap

---
 CHANGES.md                                                | 1 +
 .../lib/attachmentviewer/AnimatedImageViewHolder.kt       | 5 +++++
 .../im/vector/lib/attachmentviewer/ImageLoaderTarget.kt   | 3 +++
 .../im/vector/lib/attachmentviewer/VideoLoaderTarget.kt   | 2 ++
 .../im/vector/lib/attachmentviewer/VideoViewHolder.kt     | 8 +++++++-
 .../lib/attachmentviewer/ZoomableImageViewHolder.kt       | 5 +++++
 6 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index 1ffb6bcad0..26b06237d2 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -17,6 +17,7 @@ Bugfix 🐛:
  - Change user or room avatar: when selecting Gallery, I'm not proposed to crop the selected image (#1590)
  - Fix uploads still don't work with room v6 (#1879)
  - Can't handle ongoing call events in background (#1992)
+ - Crash / Attachment viewer: Cannot draw a recycled Bitmap #2034
 
 Translations 🗣:
  -
diff --git a/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AnimatedImageViewHolder.kt b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AnimatedImageViewHolder.kt
index 6b7818c612..96e6c92467 100644
--- a/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AnimatedImageViewHolder.kt
+++ b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AnimatedImageViewHolder.kt
@@ -27,4 +27,9 @@ class AnimatedImageViewHolder constructor(itemView: View) :
     val imageLoaderProgress: ProgressBar = itemView.findViewById(R.id.imageLoaderProgress)
 
     internal val target = DefaultImageLoaderTarget(this, this.touchImageView)
+
+    override fun onRecycled() {
+        super.onRecycled()
+        touchImageView.setImageDrawable(null)
+    }
 }
diff --git a/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ImageLoaderTarget.kt b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ImageLoaderTarget.kt
index 1e5e88d91f..9166c2ce4f 100644
--- a/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ImageLoaderTarget.kt
+++ b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ImageLoaderTarget.kt
@@ -50,6 +50,7 @@ internal class DefaultImageLoaderTarget(val holder: AnimatedImageViewHolder, pri
     override fun onLoadFailed(uid: String, errorDrawable: Drawable?) {
         if (holder.boundResourceUid != uid) return
         holder.imageLoaderProgress.isVisible = false
+        holder.touchImageView.setImageDrawable(errorDrawable)
     }
 
     override fun onResourceCleared(uid: String, placeholder: Drawable?) {
@@ -77,11 +78,13 @@ internal class DefaultImageLoaderTarget(val holder: AnimatedImageViewHolder, pri
         override fun onResourceLoading(uid: String, placeholder: Drawable?) {
             if (holder.boundResourceUid != uid) return
             holder.imageLoaderProgress.isVisible = true
+            holder.touchImageView.setImageDrawable(placeholder)
         }
 
         override fun onLoadFailed(uid: String, errorDrawable: Drawable?) {
             if (holder.boundResourceUid != uid) return
             holder.imageLoaderProgress.isVisible = false
+            holder.touchImageView.setImageDrawable(errorDrawable)
         }
 
         override fun onResourceCleared(uid: String, placeholder: Drawable?) {
diff --git a/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoLoaderTarget.kt b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoLoaderTarget.kt
index 78f46a320f..65e37ed39e 100644
--- a/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoLoaderTarget.kt
+++ b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoLoaderTarget.kt
@@ -47,6 +47,8 @@ internal class DefaultVideoLoaderTarget(val holder: VideoViewHolder, private val
     }
 
     override fun onThumbnailResourceCleared(uid: String, placeholder: Drawable?) {
+        if (holder.boundResourceUid != uid) return
+        holder.thumbnailImage.setImageDrawable(placeholder)
     }
 
     override fun onThumbnailResourceReady(uid: String, resource: Drawable) {
diff --git a/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoViewHolder.kt b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoViewHolder.kt
index 32f449d6fe..621f04426d 100644
--- a/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoViewHolder.kt
+++ b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoViewHolder.kt
@@ -16,6 +16,7 @@
 
 package im.vector.lib.attachmentviewer
 
+import android.util.Log
 import android.view.View
 import android.widget.ImageView
 import android.widget.ProgressBar
@@ -118,8 +119,13 @@ class VideoViewHolder constructor(itemView: View) :
                         eventListener?.get()?.onEvent(AttachmentEvents.VideoEvent(isPlaying, progress, duration))
                     }
         }
+        try {
+            videoView.setVideoPath(mVideoPath)
+        } catch (failure: Throwable) {
+            // Couldn't open
+            Log.v(VideoViewHolder::class.java.name, "Failed to start video ${failure.message}")
+        }
 
-        videoView.setVideoPath(mVideoPath)
         if (!wasPaused) {
             videoView.start()
             if (progress > 0) {
diff --git a/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ZoomableImageViewHolder.kt b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ZoomableImageViewHolder.kt
index 019cd3202d..49378631e8 100644
--- a/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ZoomableImageViewHolder.kt
+++ b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ZoomableImageViewHolder.kt
@@ -39,4 +39,9 @@ class ZoomableImageViewHolder constructor(itemView: View) :
     }
 
     internal val target = DefaultImageLoaderTarget.ZoomableImageTarget(this, touchImageView)
+
+    override fun onRecycled() {
+        super.onRecycled()
+        touchImageView.setImageDrawable(null)
+    }
 }

From 931eeac548fac2176bc725e5afef571696d8b4a0 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 31 Aug 2020 18:07:25 +0200
Subject: [PATCH 22/47] Add MSISDN (WIP)

---
 .../session/profile/AddThreePidTask.kt        | 14 ++++-----
 .../threepids/ThreePidsSettingsController.kt  | 29 ++++++++++++++++---
 vector/src/main/res/values/strings.xml        |  2 ++
 3 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddThreePidTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddThreePidTask.kt
index 5b24961a49..e78d8e38a5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddThreePidTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddThreePidTask.kt
@@ -78,16 +78,17 @@ internal class DefaultAddThreePidTask @Inject constructor(
         val clientSecret = UUID.randomUUID().toString()
         val sendAttempt = 1
 
-        // Get country code from the phone number
+        // Get country code and national number from the phone number
         val phoneNumber = threePid.msisdn
-
-        val parsedNumber = PhoneNumberUtil.getInstance().parse(phoneNumber, null)
+        val phoneNumberUtil = PhoneNumberUtil.getInstance()
+        val parsedNumber = phoneNumberUtil.parse(phoneNumber, null)
         val countryCode = parsedNumber.countryCode
+        val country = phoneNumberUtil.getRegionCodeForCountryCode(countryCode)
 
         val result = executeRequest<AddMsisdnResponse>(eventBus) {
             val body = AddMsisdnBody(
                     clientSecret = clientSecret,
-                    country = countryCode.asString(), // TODO Convert to String,
+                    country = country,
                     phoneNumber = parsedNumber.nationalNumber.toString(),
                     sendAttempt = sendAttempt
             )
@@ -107,10 +108,5 @@ internal class DefaultAddThreePidTask @Inject constructor(
                     .let { realm.copyToRealm(it) }
         }
     }
-
-    private fun Int.asString(): String {
-        // TODO
-        return ""
-    }
 }
 
diff --git a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsController.kt b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsController.kt
index e8321ad456..06a3a87421 100644
--- a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsController.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsController.kt
@@ -24,6 +24,7 @@ import com.airbnb.mvrx.Loading
 import com.airbnb.mvrx.Success
 import im.vector.app.R
 import im.vector.app.core.epoxy.loadingItem
+import im.vector.app.core.epoxy.noResultItem
 import im.vector.app.core.extensions.exhaustive
 import im.vector.app.core.extensions.getFormattedValue
 import im.vector.app.core.resources.ColorProvider
@@ -97,10 +98,20 @@ class ThreePidsSettingsController @Inject constructor(
 
         emails.forEach { buildThreePid("email ", it) }
 
-        // Pending threePids
+        // Pending emails
         data.pendingThreePids.invoke()
                 ?.filterIsInstance(ThreePid.Email::class.java)
-                ?.forEach { buildPendingThreePid("p_email ", it) }
+                .orEmpty()
+                .let { pendingList ->
+                    if (pendingList.isEmpty() && emails.isEmpty()) {
+                        noResultItem {
+                            id("noEmail")
+                            text(stringProvider.getString(R.string.settings_emails_empty))
+                        }
+                    }
+
+                    pendingList.forEach { buildPendingThreePid("p_email ", it) }
+                }
 
         when (data.state) {
             ThreePidsSettingsState.Idle ->
@@ -135,10 +146,20 @@ class ThreePidsSettingsController @Inject constructor(
 
         msisdn.forEach { buildThreePid("msisdn ", it) }
 
-        // Pending threePids
+        // Pending msisdn
         data.pendingThreePids.invoke()
                 ?.filterIsInstance(ThreePid.Msisdn::class.java)
-                ?.forEach { buildPendingThreePid("p_msisdn ", it) }
+                .orEmpty()
+                .let { pendingList ->
+                    if (pendingList.isEmpty() && msisdn.isEmpty()) {
+                        noResultItem {
+                            id("noMsisdn")
+                            text(stringProvider.getString(R.string.settings_phone_number_empty))
+                        }
+                    }
+
+                    pendingList.forEach { buildPendingThreePid("p_msisdn ", it) }
+                }
 
         when (data.state) {
             ThreePidsSettingsState.Idle ->
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 975525c750..1e14e0b78a 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -675,6 +675,7 @@
     <string name="settings_email_address">Email</string>
     <string name="settings_add_email_address">Add email address</string>
     <string name="settings_phone_number">Phone</string>
+    <string name="settings_phone_number_empty">No phone number has been added to your account</string>
     <string name="settings_add_phone_number">Add phone number</string>
     <string name="settings_app_info_link_title">Application info</string>
     <string name="settings_app_info_link_summary">Show the application info in the system settings.</string>
@@ -683,6 +684,7 @@
     <string name="settings_add_3pid_authentication_needed">Authentication is required</string>
 
     <string name="settings_emails">Email addresses</string>
+    <string name="settings_emails_empty">No email has been added to your account</string>
     <string name="settings_phone_numbers">Phone numbers</string>
     <string name="settings_remove_three_pid_confirmation_content">Remove %s?</string>
     <string name="error_threepid_auth_failed">Ensure that you have clicked on the link in the email we have sent to you.</string>

From bf5c1e9d8f090010de3f58756b389f393efa6151 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 31 Aug 2020 20:53:37 +0200
Subject: [PATCH 23/47] Add phone numbers to account

---
 CHANGES.md                                    |  2 +-
 .../sdk/api/session/profile/ProfileService.kt |  5 ++
 .../session/profile/DefaultProfileService.kt  |  9 +++
 .../internal/session/profile/ProfileAPI.kt    | 10 +++
 .../internal/session/profile/ProfileModule.kt |  3 +
 .../session/profile/ValidateSmsCodeTask.kt    | 70 +++++++++++++++++++
 .../threepids/ThreePidsSettingsAction.kt      |  1 +
 .../threepids/ThreePidsSettingsController.kt  | 47 ++++++++++---
 .../threepids/ThreePidsSettingsFragment.kt    |  6 ++
 .../threepids/ThreePidsSettingsViewModel.kt   | 29 +++++++-
 vector/src/main/res/values/strings.xml        |  2 +
 11 files changed, 171 insertions(+), 13 deletions(-)
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ValidateSmsCodeTask.kt

diff --git a/CHANGES.md b/CHANGES.md
index b96337097b..9bd7a8be6b 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -2,7 +2,7 @@ Changes in Element 1.0.6 (2020-XX-XX)
 ===================================================
 
 Features ✨:
- - List phone numbers and emails added to the Matrix account, and add Email to account (#44)
+ - List phone numbers and emails added to the Matrix account, and add Email adn phone numbers to account (#44, #45)
 
 Improvements 🙌:
  - You can now join room through permalink and within room directory search
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/profile/ProfileService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/profile/ProfileService.kt
index 5033a498d0..8742c9e7d0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/profile/ProfileService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/profile/ProfileService.kt
@@ -99,6 +99,11 @@ interface ProfileService {
      */
     fun addThreePid(threePid: ThreePid, matrixCallback: MatrixCallback<Unit>): Cancelable
 
+    /**
+     * Validate a code received by text message
+     */
+    fun submitSmsCode(threePid: ThreePid.Msisdn, code: String, matrixCallback: MatrixCallback<Unit>): Cancelable
+
     /**
      * Finalize adding a 3Pids. Call this method once the user has validated that he owns the ThreePid
      */
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DefaultProfileService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DefaultProfileService.kt
index b2f4ba0878..97212a8687 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DefaultProfileService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DefaultProfileService.kt
@@ -46,6 +46,7 @@ internal class DefaultProfileService @Inject constructor(private val taskExecuto
                                                          private val setDisplayNameTask: SetDisplayNameTask,
                                                          private val setAvatarUrlTask: SetAvatarUrlTask,
                                                          private val addThreePidTask: AddThreePidTask,
+                                                         private val validateSmsCodeTask: ValidateSmsCodeTask,
                                                          private val finalizeAddingThreePidTask: FinalizeAddingThreePidTask,
                                                          private val deleteThreePidTask: DeleteThreePidTask,
                                                          private val pendingThreePidMapper: PendingThreePidMapper,
@@ -158,6 +159,14 @@ internal class DefaultProfileService @Inject constructor(private val taskExecuto
                 .executeBy(taskExecutor)
     }
 
+    override fun submitSmsCode(threePid: ThreePid.Msisdn, code: String, matrixCallback: MatrixCallback<Unit>): Cancelable {
+        return validateSmsCodeTask
+                .configureWith(ValidateSmsCodeTask.Params(threePid, code)) {
+                    callback = matrixCallback
+                }
+                .executeBy(taskExecutor)
+    }
+
     override fun finalizeAddingThreePid(threePid: ThreePid,
                                         uiaSession: String?,
                                         accountPassword: String?,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ProfileAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ProfileAPI.kt
index cfd965e23f..4e2f518c5a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ProfileAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ProfileAPI.kt
@@ -19,6 +19,8 @@
 package org.matrix.android.sdk.internal.session.profile
 
 import org.matrix.android.sdk.api.util.JsonDict
+import org.matrix.android.sdk.internal.auth.registration.SuccessResult
+import org.matrix.android.sdk.internal.auth.registration.ValidationCodeBody
 import org.matrix.android.sdk.internal.network.NetworkConstants
 import retrofit2.Call
 import retrofit2.http.Body
@@ -26,6 +28,7 @@ import retrofit2.http.GET
 import retrofit2.http.POST
 import retrofit2.http.PUT
 import retrofit2.http.Path
+import retrofit2.http.Url
 
 internal interface ProfileAPI {
     /**
@@ -83,6 +86,13 @@ internal interface ProfileAPI {
     @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "account/3pid/msisdn/requestToken")
     fun addMsisdn(@Body body: AddMsisdnBody): Call<AddMsisdnResponse>
 
+    /**
+     * Validate Msisdn code (same model than for Identity server API)
+     */
+    @POST
+    fun validateMsisdn(@Url url: String,
+                       @Body params: ValidationCodeBody): Call<SuccessResult>
+
     /**
      * Ref: https://matrix.org/docs/spec/client_server/r0.6.1#post-matrix-client-r0-account-3pid-add
      */
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ProfileModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ProfileModule.kt
index baeaf9fd58..ae7ae7a6f3 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ProfileModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ProfileModule.kt
@@ -62,6 +62,9 @@ internal abstract class ProfileModule {
     @Binds
     abstract fun bindAddThreePidTask(task: DefaultAddThreePidTask): AddThreePidTask
 
+    @Binds
+    abstract fun bindValidateSmsCodeTask(task: DefaultValidateSmsCodeTask): ValidateSmsCodeTask
+
     @Binds
     abstract fun bindFinalizeAddingThreePidTask(task: DefaultFinalizeAddingThreePidTask): FinalizeAddingThreePidTask
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ValidateSmsCodeTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ValidateSmsCodeTask.kt
new file mode 100644
index 0000000000..b11955b96a
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ValidateSmsCodeTask.kt
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.profile
+
+import com.zhuinden.monarchy.Monarchy
+import org.greenrobot.eventbus.EventBus
+import org.matrix.android.sdk.api.failure.Failure
+import org.matrix.android.sdk.api.session.identity.ThreePid
+import org.matrix.android.sdk.internal.auth.registration.SuccessResult
+import org.matrix.android.sdk.internal.auth.registration.ValidationCodeBody
+import org.matrix.android.sdk.internal.database.model.PendingThreePidEntity
+import org.matrix.android.sdk.internal.di.SessionDatabase
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.task.Task
+import javax.inject.Inject
+
+internal interface ValidateSmsCodeTask : Task<ValidateSmsCodeTask.Params, Unit> {
+    data class Params(
+            val threePid: ThreePid.Msisdn,
+            val code: String
+    )
+}
+
+internal class DefaultValidateSmsCodeTask @Inject constructor(
+        private val profileAPI: ProfileAPI,
+        @SessionDatabase
+        private val monarchy: Monarchy,
+        private val pendingThreePidMapper: PendingThreePidMapper,
+        private val eventBus: EventBus
+) : ValidateSmsCodeTask {
+
+    override suspend fun execute(params: ValidateSmsCodeTask.Params) {
+        // Search the pending ThreePid
+        val pendingThreePids = monarchy.fetchAllMappedSync(
+                { it.where(PendingThreePidEntity::class.java) },
+                { pendingThreePidMapper.map(it) }
+        )
+                .firstOrNull { it.threePid == params.threePid }
+                ?: throw IllegalArgumentException("unknown threepid")
+
+        val url = pendingThreePids.submitUrl ?: throw IllegalArgumentException("invalid threepid")
+        val body = ValidationCodeBody(
+                clientSecret = pendingThreePids.clientSecret,
+                sid = pendingThreePids.sid,
+                code = params.code
+        )
+        val result = executeRequest<SuccessResult>(eventBus) {
+            apiCall = profileAPI.validateMsisdn(url, body)
+        }
+
+        if (!result.isSuccess()) {
+            throw Failure.SuccessError
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsAction.kt b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsAction.kt
index 1dac082b63..d3df4b6e75 100644
--- a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsAction.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsAction.kt
@@ -22,6 +22,7 @@ import org.matrix.android.sdk.api.session.identity.ThreePid
 sealed class ThreePidsSettingsAction : VectorViewModelAction {
     data class ChangeState(val newState: ThreePidsSettingsState) : ThreePidsSettingsAction()
     data class AddThreePid(val threePid: ThreePid) : ThreePidsSettingsAction()
+    data class SubmitCode(val threePid: ThreePid.Msisdn, val code: String) : ThreePidsSettingsAction()
     data class ContinueThreePid(val threePid: ThreePid) : ThreePidsSettingsAction()
     data class CancelThreePid(val threePid: ThreePid) : ThreePidsSettingsAction()
     data class AccountPassword(val password: String) : ThreePidsSettingsAction()
diff --git a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsController.kt b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsController.kt
index 06a3a87421..51121d27e5 100644
--- a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsController.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsController.kt
@@ -50,6 +50,7 @@ class ThreePidsSettingsController @Inject constructor(
         fun cancelAdding()
         fun doAddEmail(email: String)
         fun doAddMsisdn(msisdn: String)
+        fun submitCode(threePid: ThreePid.Msisdn, code: String)
         fun continueThreePid(threePid: ThreePid)
         fun cancelThreePid(threePid: ThreePid)
         fun deleteThreePid(threePid: ThreePid)
@@ -57,8 +58,12 @@ class ThreePidsSettingsController @Inject constructor(
 
     var interactionListener: InteractionListener? = null
 
+    // For phone number or email (exclusive)
     private var currentInputValue = ""
 
+    // For validation code
+    private val currentCodes = mutableMapOf<ThreePid, String>()
+
     override fun buildModels(data: ThreePidsSettingsViewState?) {
         if (data == null) return
 
@@ -210,18 +215,38 @@ class ThreePidsSettingsController @Inject constructor(
             title(threePid.getFormattedValue())
         }
 
-        if (threePid is ThreePid.Email) {
-            settingsInformationItem {
-                id("info" + idPrefix + threePid.value)
-                message(stringProvider.getString(R.string.account_email_validation_message))
-                colorProvider(colorProvider)
+        when (threePid) {
+            is ThreePid.Email -> {
+                settingsInformationItem {
+                    id("info" + idPrefix + threePid.value)
+                    message(stringProvider.getString(R.string.account_email_validation_message))
+                    colorProvider(colorProvider)
+                }
+                settingsContinueCancelItem {
+                    id("cont" + idPrefix + threePid.value)
+                    continueOnClick { interactionListener?.continueThreePid(threePid) }
+                    cancelOnClick { interactionListener?.cancelThreePid(threePid) }
+                }
+            }
+            is ThreePid.Msisdn -> {
+                settingsInformationItem {
+                    id("info" + idPrefix + threePid.value)
+                    message(stringProvider.getString(R.string.settings_text_message_sent, threePid.getFormattedValue()))
+                    colorProvider(colorProvider)
+                }
+                formEditTextItem {
+                    id("msisdnVerification${threePid.value}")
+                    inputType(InputType.TYPE_CLASS_NUMBER)
+                    hint(stringProvider.getString(R.string.settings_text_message_sent_hint))
+                    showBottomSeparator(false)
+                    onTextChange { currentCodes[threePid] = it }
+                }
+                settingsContinueCancelItem {
+                    id("cont" + idPrefix + threePid.value)
+                    continueOnClick { interactionListener?.submitCode(threePid, currentCodes[threePid] ?: "") }
+                    cancelOnClick { interactionListener?.cancelThreePid(threePid) }
+                }
             }
-        }
-
-        settingsContinueCancelItem {
-            id("cont" + idPrefix + threePid.value)
-            continueOnClick { interactionListener?.continueThreePid(threePid) }
-            cancelOnClick { interactionListener?.cancelThreePid(threePid) }
         }
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsFragment.kt b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsFragment.kt
index 8ca506e819..85512b61ab 100644
--- a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsFragment.kt
@@ -132,6 +132,12 @@ class ThreePidsSettingsFragment @Inject constructor(
         viewModel.handle(ThreePidsSettingsAction.AddThreePid(ThreePid.Msisdn(safeMsisdn)))
     }
 
+    override fun submitCode(threePid: ThreePid.Msisdn, code: String) {
+        viewModel.handle(ThreePidsSettingsAction.SubmitCode(threePid, code))
+        // Hide the keyboard
+        view?.hideKeyboard()
+    }
+
     override fun cancelAdding() {
         viewModel.handle(ThreePidsSettingsAction.ChangeState(ThreePidsSettingsState.Idle))
         // Hide the keyboard
diff --git a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewModel.kt
index f0bb0e9e41..9f7a201c2d 100644
--- a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewModel.kt
@@ -131,6 +131,7 @@ class ThreePidsSettingsViewModel @AssistedInject constructor(
         when (action) {
             is ThreePidsSettingsAction.AddThreePid -> handleAddThreePid(action)
             is ThreePidsSettingsAction.ContinueThreePid -> handleContinueThreePid(action)
+            is ThreePidsSettingsAction.SubmitCode -> handleSubmitCode(action)
             is ThreePidsSettingsAction.CancelThreePid -> handleCancelThreePid(action)
             is ThreePidsSettingsAction.AccountPassword -> handleAccountPassword(action)
             is ThreePidsSettingsAction.DeleteThreePid -> handleDeleteThreePid(action)
@@ -138,6 +139,27 @@ class ThreePidsSettingsViewModel @AssistedInject constructor(
         }.exhaustive
     }
 
+    private fun handleSubmitCode(action: ThreePidsSettingsAction.SubmitCode) {
+        isLoading(true)
+        viewModelScope.launch {
+            // First submit the code
+            session.submitSmsCode(action.threePid, action.code, object : MatrixCallback<Unit> {
+                override fun onSuccess(data: Unit) {
+                    // then finalize
+                    pendingThreePid = action.threePid
+                    session.finalizeAddingThreePid(action.threePid, null, null, loadingCallback)
+                }
+
+                override fun onFailure(failure: Throwable) {
+                    // Wrong code?
+                    isLoading(false)
+                    _viewEvents.post(ThreePidsSettingsViewEvents.Failure(failure))
+                }
+            })
+
+        }
+    }
+
     private fun handleChangeState(action: ThreePidsSettingsAction.ChangeState) {
         setState {
             copy(
@@ -152,7 +174,12 @@ class ThreePidsSettingsViewModel @AssistedInject constructor(
         withState { state ->
             val allThreePids = state.threePids.invoke().orEmpty() + state.pendingThreePids.invoke().orEmpty()
             if (allThreePids.any { it.value == action.threePid.value }) {
-                _viewEvents.post(ThreePidsSettingsViewEvents.Failure(IllegalArgumentException(stringProvider.getString(R.string.auth_email_already_defined))))
+                _viewEvents.post(ThreePidsSettingsViewEvents.Failure(IllegalArgumentException(stringProvider.getString(
+                        when (action.threePid) {
+                            is ThreePid.Email  -> R.string.auth_email_already_defined
+                            is ThreePid.Msisdn -> R.string.auth_msisdn_already_defined
+                        }
+                ))))
             } else {
                 viewModelScope.launch {
                     session.addThreePid(action.threePid, object : MatrixCallback<Unit> {
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 1e14e0b78a..74a60a969d 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -281,6 +281,7 @@
     <string name="auth_invalid_email">"This doesn’t look like a valid email address"</string>
     <string name="auth_invalid_phone">"This doesn’t look like a valid phone number"</string>
     <string name="auth_email_already_defined">This email address is already defined.</string>
+    <string name="auth_msisdn_already_defined">This phone number is already defined.</string>
     <string name="auth_missing_email">Missing email address</string>
     <string name="auth_missing_phone">Missing phone number</string>
     <string name="auth_missing_email_or_phone">Missing email address or phone number</string>
@@ -1765,6 +1766,7 @@
     <string name="settings_discovery_no_terms_title">Identity server has no terms of services</string>
     <string name="settings_discovery_no_terms">The identity server you have chosen does not have any terms of services. Only continue if you trust the owner of the service</string>
     <string name="settings_text_message_sent">A text message has been sent to %s. Please enter the verification code it contains.</string>
+    <string name="settings_text_message_sent_hint">Code</string>
     <string name="settings_text_message_sent_wrong_code">The verification code is not correct.</string>
 
     <string name="settings_discovery_disconnect_with_bound_pid">You are currently sharing email addresses or phone numbers on the identity server %1$s. You will need to reconnect to %2$s to stop sharing them.</string>

From ddb858380e50a9cab6bb17917cc89125f8c1b390 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 31 Aug 2020 21:46:55 +0200
Subject: [PATCH 24/47] Code quality

---
 .../sdk/internal/session/profile/AddThreePidTask.kt       | 1 -
 .../sdk/internal/session/profile/PendingThreePid.kt       | 1 -
 .../settings/threepids/ThreePidsSettingsFragment.kt       | 8 ++++++--
 .../settings/threepids/ThreePidsSettingsViewModel.kt      | 1 -
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddThreePidTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddThreePidTask.kt
index e78d8e38a5..c844c8ca6f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddThreePidTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddThreePidTask.kt
@@ -109,4 +109,3 @@ internal class DefaultAddThreePidTask @Inject constructor(
         }
     }
 }
-
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/PendingThreePid.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/PendingThreePid.kt
index ea3d0f1ee8..af7e217d47 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/PendingThreePid.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/PendingThreePid.kt
@@ -27,4 +27,3 @@ internal data class PendingThreePid(
         // For Msisdn only
         val submitUrl: String?
 )
-
diff --git a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsFragment.kt b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsFragment.kt
index 85512b61ab..3c2704e59e 100644
--- a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsFragment.kt
@@ -120,12 +120,16 @@ class ThreePidsSettingsFragment @Inject constructor(
 
         // Check that phone number is valid
         if (!msisdn.startsWith("+")) {
-            viewModel.handle(ThreePidsSettingsAction.ChangeState(ThreePidsSettingsState.AddingPhoneNumber(getString(R.string.login_msisdn_error_not_international))))
+            viewModel.handle(
+                    ThreePidsSettingsAction.ChangeState(ThreePidsSettingsState.AddingPhoneNumber(getString(R.string.login_msisdn_error_not_international)))
+            )
             return
         }
 
         if (!msisdn.isMsisdn()) {
-            viewModel.handle(ThreePidsSettingsAction.ChangeState(ThreePidsSettingsState.AddingPhoneNumber(getString(R.string.login_msisdn_error_other))))
+            viewModel.handle(
+                    ThreePidsSettingsAction.ChangeState(ThreePidsSettingsState.AddingPhoneNumber(getString(R.string.login_msisdn_error_other)))
+            )
             return
         }
 
diff --git a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewModel.kt
index 9f7a201c2d..78b20fc26d 100644
--- a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewModel.kt
@@ -156,7 +156,6 @@ class ThreePidsSettingsViewModel @AssistedInject constructor(
                     _viewEvents.post(ThreePidsSettingsViewEvents.Failure(failure))
                 }
             })
-
         }
     }
 

From 5594489b6989c02405d76b21989dc3b5078082bf Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 31 Aug 2020 22:20:59 +0200
Subject: [PATCH 25/47] Optimisation and cleanup

---
 .../im/vector/app/core/extensions/ThreePid.kt |  3 +-
 .../discovery/DiscoverySettingsController.kt  |  4 +-
 .../discovery/SettingsEditTextItem.kt         | 10 ++--
 .../threepids/ThreePidsSettingsController.kt  | 46 ++++++++++++++-----
 .../threepids/ThreePidsSettingsFragment.kt    |  3 +-
 5 files changed, 47 insertions(+), 19 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/core/extensions/ThreePid.kt b/vector/src/main/java/im/vector/app/core/extensions/ThreePid.kt
index 8afbfd0f63..5d91370963 100644
--- a/vector/src/main/java/im/vector/app/core/extensions/ThreePid.kt
+++ b/vector/src/main/java/im/vector/app/core/extensions/ThreePid.kt
@@ -17,6 +17,7 @@
 package im.vector.app.core.extensions
 
 import com.google.i18n.phonenumbers.PhoneNumberUtil
+import org.matrix.android.sdk.api.extensions.ensurePrefix
 import org.matrix.android.sdk.api.extensions.tryThis
 import org.matrix.android.sdk.api.session.identity.ThreePid
 
@@ -25,7 +26,7 @@ fun ThreePid.getFormattedValue(): String {
         is ThreePid.Email  -> email
         is ThreePid.Msisdn -> {
             tryThis(message = "Unable to parse the phone number") {
-                PhoneNumberUtil.getInstance().parse("+$msisdn", null)
+                PhoneNumberUtil.getInstance().parse(msisdn.ensurePrefix("+"), null)
             }
                     ?.let {
                         PhoneNumberUtil.getInstance().format(it, PhoneNumberUtil.PhoneNumberFormat.INTERNATIONAL)
diff --git a/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsController.kt b/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsController.kt
index e68537a108..306d9bffd1 100644
--- a/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsController.kt
+++ b/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsController.kt
@@ -267,8 +267,8 @@ class DiscoverySettingsController @Inject constructor(
                         }
                     }
 
-                    override fun onCodeChange(code: String) {
-                        codes[pidInfo.threePid] = code
+                    override fun onTextChange(text: String) {
+                        codes[pidInfo.threePid] = text
                     }
                 })
             }
diff --git a/vector/src/main/java/im/vector/app/features/discovery/SettingsEditTextItem.kt b/vector/src/main/java/im/vector/app/features/discovery/SettingsEditTextItem.kt
index 81d46373a2..8d199e4eda 100644
--- a/vector/src/main/java/im/vector/app/features/discovery/SettingsEditTextItem.kt
+++ b/vector/src/main/java/im/vector/app/features/discovery/SettingsEditTextItem.kt
@@ -31,15 +31,17 @@ import im.vector.app.core.extensions.setTextOrHide
 @EpoxyModelClass(layout = R.layout.item_settings_edit_text)
 abstract class SettingsEditTextItem : EpoxyModelWithHolder<SettingsEditTextItem.Holder>() {
 
+    @EpoxyAttribute var hint: String? = null
     @EpoxyAttribute var descriptionText: String? = null
     @EpoxyAttribute var errorText: String? = null
     @EpoxyAttribute var inProgress: Boolean = false
+    @EpoxyAttribute var inputType: Int? = null
 
     @EpoxyAttribute
     var interactionListener: Listener? = null
 
-    private val textChangeListener: (text: CharSequence?, start: Int, count: Int, after: Int) -> Unit = { code, _, _, _ ->
-        code?.let { interactionListener?.onCodeChange(it.toString()) }
+    private val textChangeListener: (text: CharSequence?, start: Int, count: Int, after: Int) -> Unit = { text, _, _, _ ->
+        text?.let { interactionListener?.onTextChange(it.toString()) }
     }
 
     private val editorActionListener = object : TextView.OnEditorActionListener {
@@ -63,6 +65,8 @@ abstract class SettingsEditTextItem : EpoxyModelWithHolder<SettingsEditTextItem.
         } else {
             holder.textInputLayout.error = errorText
         }
+        holder.textInputLayout.hint = hint
+        inputType?.let { holder.editText.inputType = it }
 
         holder.editText.doOnTextChanged(textChangeListener)
         holder.editText.setOnEditorActionListener(editorActionListener)
@@ -76,6 +80,6 @@ abstract class SettingsEditTextItem : EpoxyModelWithHolder<SettingsEditTextItem.
 
     interface Listener {
         fun onValidate()
-        fun onCodeChange(code: String)
+        fun onTextChange(text: String)
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsController.kt b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsController.kt
index 51121d27e5..3dda8f5e35 100644
--- a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsController.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsController.kt
@@ -31,11 +31,12 @@ import im.vector.app.core.resources.ColorProvider
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.core.ui.list.genericButtonItem
 import im.vector.app.core.ui.list.genericFooterItem
+import im.vector.app.features.discovery.SettingsEditTextItem
 import im.vector.app.features.discovery.settingsContinueCancelItem
+import im.vector.app.features.discovery.settingsEditTextItem
 import im.vector.app.features.discovery.settingsInfoItem
 import im.vector.app.features.discovery.settingsInformationItem
 import im.vector.app.features.discovery.settingsSectionTitleItem
-import im.vector.app.features.form.formEditTextItem
 import org.matrix.android.sdk.api.session.identity.ThreePid
 import javax.inject.Inject
 
@@ -127,13 +128,20 @@ class ThreePidsSettingsController @Inject constructor(
                     buttonClickAction(View.OnClickListener { interactionListener?.addEmail() })
                 }
             is ThreePidsSettingsState.AddingEmail -> {
-                formEditTextItem {
+                settingsEditTextItem {
                     id("addingEmail")
                     inputType(InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS)
                     hint(stringProvider.getString(R.string.medium_email))
-                    errorMessage(data.state.error)
-                    onTextChange { currentInputValue = it }
-                    showBottomSeparator(false)
+                    errorText(data.state.error)
+                    interactionListener(object : SettingsEditTextItem.Listener {
+                        override fun onValidate() {
+                            interactionListener?.doAddEmail(currentInputValue)
+                        }
+
+                        override fun onTextChange(text: String) {
+                            currentInputValue = text
+                        }
+                    })
                 }
                 settingsContinueCancelItem {
                     id("contAddingEmail")
@@ -180,13 +188,20 @@ class ThreePidsSettingsController @Inject constructor(
                     id("addingMsisdnInfo")
                     helperText(stringProvider.getString(R.string.login_msisdn_notice))
                 }
-                formEditTextItem {
+                settingsEditTextItem {
                     id("addingMsisdn")
                     inputType(InputType.TYPE_CLASS_PHONE)
                     hint(stringProvider.getString(R.string.medium_phone_number))
-                    errorMessage(data.state.error)
-                    onTextChange { currentInputValue = it }
-                    showBottomSeparator(false)
+                    errorText(data.state.error)
+                    interactionListener(object : SettingsEditTextItem.Listener {
+                        override fun onValidate() {
+                            interactionListener?.doAddMsisdn(currentInputValue)
+                        }
+
+                        override fun onTextChange(text: String) {
+                            currentInputValue = text
+                        }
+                    })
                 }
                 settingsContinueCancelItem {
                     id("contAddingMsisdn")
@@ -234,12 +249,19 @@ class ThreePidsSettingsController @Inject constructor(
                     message(stringProvider.getString(R.string.settings_text_message_sent, threePid.getFormattedValue()))
                     colorProvider(colorProvider)
                 }
-                formEditTextItem {
+                settingsEditTextItem {
                     id("msisdnVerification${threePid.value}")
                     inputType(InputType.TYPE_CLASS_NUMBER)
                     hint(stringProvider.getString(R.string.settings_text_message_sent_hint))
-                    showBottomSeparator(false)
-                    onTextChange { currentCodes[threePid] = it }
+                    interactionListener(object : SettingsEditTextItem.Listener {
+                        override fun onValidate() {
+                            interactionListener?.submitCode(threePid, currentCodes[threePid] ?: "")
+                        }
+
+                        override fun onTextChange(text: String) {
+                            currentCodes[threePid] = text
+                        }
+                    })
                 }
                 settingsContinueCancelItem {
                     id("cont" + idPrefix + threePid.value)
diff --git a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsFragment.kt b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsFragment.kt
index 3c2704e59e..5c8e4e7b5d 100644
--- a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsFragment.kt
@@ -28,6 +28,7 @@ import im.vector.app.core.dialogs.withColoredButton
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
 import im.vector.app.core.extensions.exhaustive
+import im.vector.app.core.extensions.getFormattedValue
 import im.vector.app.core.extensions.hideKeyboard
 import im.vector.app.core.extensions.isEmail
 import im.vector.app.core.extensions.isMsisdn
@@ -158,7 +159,7 @@ class ThreePidsSettingsFragment @Inject constructor(
 
     override fun deleteThreePid(threePid: ThreePid) {
         AlertDialog.Builder(requireActivity())
-                .setMessage(getString(R.string.settings_remove_three_pid_confirmation_content, threePid.value))
+                .setMessage(getString(R.string.settings_remove_three_pid_confirmation_content, threePid.getFormattedValue()))
                 .setPositiveButton(R.string.remove) { _, _ ->
                     viewModel.handle(ThreePidsSettingsAction.DeleteThreePid(threePid))
                 }

From 1d53b48c8a89b153b6f869980b80694591e31cb9 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 31 Aug 2020 23:11:58 +0200
Subject: [PATCH 26/47] Inline wrong token error

---
 .../threepids/ThreePidsSettingsController.kt  | 26 ++++++++++++++++---
 .../threepids/ThreePidsSettingsViewModel.kt   | 19 ++++++++++++--
 .../threepids/ThreePidsSettingsViewState.kt   |  3 ++-
 3 files changed, 41 insertions(+), 7 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsController.kt b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsController.kt
index 3dda8f5e35..331bff0b4a 100644
--- a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsController.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsController.kt
@@ -25,6 +25,7 @@ import com.airbnb.mvrx.Success
 import im.vector.app.R
 import im.vector.app.core.epoxy.loadingItem
 import im.vector.app.core.epoxy.noResultItem
+import im.vector.app.core.error.ErrorFormatter
 import im.vector.app.core.extensions.exhaustive
 import im.vector.app.core.extensions.getFormattedValue
 import im.vector.app.core.resources.ColorProvider
@@ -37,12 +38,15 @@ import im.vector.app.features.discovery.settingsEditTextItem
 import im.vector.app.features.discovery.settingsInfoItem
 import im.vector.app.features.discovery.settingsInformationItem
 import im.vector.app.features.discovery.settingsSectionTitleItem
+import org.matrix.android.sdk.api.failure.Failure
+import org.matrix.android.sdk.api.failure.MatrixError
 import org.matrix.android.sdk.api.session.identity.ThreePid
 import javax.inject.Inject
 
 class ThreePidsSettingsController @Inject constructor(
         private val stringProvider: StringProvider,
-        private val colorProvider: ColorProvider
+        private val colorProvider: ColorProvider,
+        private val errorFormatter: ErrorFormatter
 ) : TypedEpoxyController<ThreePidsSettingsViewState>() {
 
     interface InteractionListener {
@@ -116,7 +120,7 @@ class ThreePidsSettingsController @Inject constructor(
                         }
                     }
 
-                    pendingList.forEach { buildPendingThreePid("p_email ", it) }
+                    pendingList.forEach { buildPendingThreePid(data, "p_email ", it) }
                 }
 
         when (data.state) {
@@ -171,7 +175,7 @@ class ThreePidsSettingsController @Inject constructor(
                         }
                     }
 
-                    pendingList.forEach { buildPendingThreePid("p_msisdn ", it) }
+                    pendingList.forEach { buildPendingThreePid(data, "p_msisdn ", it) }
                 }
 
         when (data.state) {
@@ -222,7 +226,7 @@ class ThreePidsSettingsController @Inject constructor(
         }
     }
 
-    private fun buildPendingThreePid(idPrefix: String, threePid: ThreePid) {
+    private fun buildPendingThreePid(data: ThreePidsSettingsViewState, idPrefix: String, threePid: ThreePid) {
         threePidItem {
             id(idPrefix + threePid.value)
             // TODO Add an icon for emails
@@ -253,6 +257,7 @@ class ThreePidsSettingsController @Inject constructor(
                     id("msisdnVerification${threePid.value}")
                     inputType(InputType.TYPE_CLASS_NUMBER)
                     hint(stringProvider.getString(R.string.settings_text_message_sent_hint))
+                    errorText(getCodeError(data, threePid))
                     interactionListener(object : SettingsEditTextItem.Listener {
                         override fun onValidate() {
                             interactionListener?.submitCode(threePid, currentCodes[threePid] ?: "")
@@ -271,4 +276,17 @@ class ThreePidsSettingsController @Inject constructor(
             }
         }
     }
+
+    private fun getCodeError(data: ThreePidsSettingsViewState, threePid: ThreePid.Msisdn): String? {
+        val failure = (data.msisdnValidationRequests[threePid.value] as? Fail)?.error ?: return null
+        // Wrong code?
+        // See https://github.com/matrix-org/synapse/issues/8218
+        return if (failure is Failure.ServerError
+                && failure.httpCode == 400
+                && failure.error.code == MatrixError.M_UNKNOWN) {
+            stringProvider.getString(R.string.settings_text_message_sent_wrong_code)
+        } else {
+            errorFormatter.toHumanReadable(failure)
+        }
+    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewModel.kt
index 78b20fc26d..0501d77808 100644
--- a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewModel.kt
@@ -18,7 +18,9 @@ package im.vector.app.features.settings.threepids
 
 import androidx.lifecycle.viewModelScope
 import com.airbnb.mvrx.ActivityViewModelContext
+import com.airbnb.mvrx.Fail
 import com.airbnb.mvrx.FragmentViewModelContext
+import com.airbnb.mvrx.Loading
 import com.airbnb.mvrx.MvRxViewModelFactory
 import com.airbnb.mvrx.ViewModelContext
 import com.squareup.inject.assisted.Assisted
@@ -141,6 +143,14 @@ class ThreePidsSettingsViewModel @AssistedInject constructor(
 
     private fun handleSubmitCode(action: ThreePidsSettingsAction.SubmitCode) {
         isLoading(true)
+        setState {
+            copy(
+                    msisdnValidationRequests = msisdnValidationRequests.toMutableMap().apply {
+                        put(action.threePid.value, Loading())
+                    }
+            )
+        }
+
         viewModelScope.launch {
             // First submit the code
             session.submitSmsCode(action.threePid, action.code, object : MatrixCallback<Unit> {
@@ -151,9 +161,14 @@ class ThreePidsSettingsViewModel @AssistedInject constructor(
                 }
 
                 override fun onFailure(failure: Throwable) {
-                    // Wrong code?
                     isLoading(false)
-                    _viewEvents.post(ThreePidsSettingsViewEvents.Failure(failure))
+                    setState {
+                        copy(
+                                msisdnValidationRequests = msisdnValidationRequests.toMutableMap().apply {
+                                    put(action.threePid.value, Fail(failure))
+                                }
+                        )
+                    }
                 }
             })
         }
diff --git a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewState.kt b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewState.kt
index 47590286e0..4233ee1005 100644
--- a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewState.kt
@@ -25,5 +25,6 @@ data class ThreePidsSettingsViewState(
         val state: ThreePidsSettingsState = ThreePidsSettingsState.Idle,
         val isLoading: Boolean = false,
         val threePids: Async<List<ThreePid>> = Uninitialized,
-        val pendingThreePids: Async<List<ThreePid>> = Uninitialized
+        val pendingThreePids: Async<List<ThreePid>> = Uninitialized,
+        val msisdnValidationRequests: Map<String, Async<Unit>> = emptyMap()
 ) : MvRxState

From 56261bd741687d537d888532cc5e6c433d8d5319 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 1 Sep 2020 10:05:39 +0200
Subject: [PATCH 27/47] Add a trick to reset EditText field when recycled.

---
 .../java/im/vector/app/core/utils/ReadOnce.kt | 45 +++++++++++++++++++
 .../discovery/SettingsEditTextItem.kt         |  4 ++
 .../threepids/ThreePidsSettingsController.kt  |  9 ++++
 .../threepids/ThreePidsSettingsViewModel.kt   | 14 +++++-
 .../threepids/ThreePidsSettingsViewState.kt   |  5 ++-
 5 files changed, 74 insertions(+), 3 deletions(-)
 create mode 100644 vector/src/main/java/im/vector/app/core/utils/ReadOnce.kt

diff --git a/vector/src/main/java/im/vector/app/core/utils/ReadOnce.kt b/vector/src/main/java/im/vector/app/core/utils/ReadOnce.kt
new file mode 100644
index 0000000000..4283ecefab
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/core/utils/ReadOnce.kt
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.core.utils
+
+import java.util.concurrent.atomic.AtomicBoolean
+
+/**
+ * Use this container to read a value only once
+ */
+class ReadOnce<T>(
+        private val value: T
+) {
+    private val valueHasBeenRead = AtomicBoolean(false)
+
+    fun get(): T? {
+        return if (valueHasBeenRead.getAndSet(true)) {
+            null
+        } else {
+            value
+        }
+    }
+}
+
+/**
+ * Only the first call to isTrue() will return true
+ */
+class ReadOnceTrue {
+    private val readOnce = ReadOnce(true)
+
+    fun isTrue() = readOnce.get() == true
+}
diff --git a/vector/src/main/java/im/vector/app/features/discovery/SettingsEditTextItem.kt b/vector/src/main/java/im/vector/app/features/discovery/SettingsEditTextItem.kt
index 8d199e4eda..99303a8934 100644
--- a/vector/src/main/java/im/vector/app/features/discovery/SettingsEditTextItem.kt
+++ b/vector/src/main/java/im/vector/app/features/discovery/SettingsEditTextItem.kt
@@ -32,6 +32,7 @@ import im.vector.app.core.extensions.setTextOrHide
 abstract class SettingsEditTextItem : EpoxyModelWithHolder<SettingsEditTextItem.Holder>() {
 
     @EpoxyAttribute var hint: String? = null
+    @EpoxyAttribute var value: String? = null
     @EpoxyAttribute var descriptionText: String? = null
     @EpoxyAttribute var errorText: String? = null
     @EpoxyAttribute var inProgress: Boolean = false
@@ -70,6 +71,9 @@ abstract class SettingsEditTextItem : EpoxyModelWithHolder<SettingsEditTextItem.
 
         holder.editText.doOnTextChanged(textChangeListener)
         holder.editText.setOnEditorActionListener(editorActionListener)
+        if (value != null) {
+            holder.editText.setText(value)
+        }
     }
 
     class Holder : VectorEpoxyHolder() {
diff --git a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsController.kt b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsController.kt
index 331bff0b4a..fa0be356a0 100644
--- a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsController.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsController.kt
@@ -136,6 +136,9 @@ class ThreePidsSettingsController @Inject constructor(
                     id("addingEmail")
                     inputType(InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS)
                     hint(stringProvider.getString(R.string.medium_email))
+                    if (data.editTextReinitiator?.isTrue() == true) {
+                        value("")
+                    }
                     errorText(data.state.error)
                     interactionListener(object : SettingsEditTextItem.Listener {
                         override fun onValidate() {
@@ -196,6 +199,9 @@ class ThreePidsSettingsController @Inject constructor(
                     id("addingMsisdn")
                     inputType(InputType.TYPE_CLASS_PHONE)
                     hint(stringProvider.getString(R.string.medium_phone_number))
+                    if (data.editTextReinitiator?.isTrue() == true) {
+                        value("")
+                    }
                     errorText(data.state.error)
                     interactionListener(object : SettingsEditTextItem.Listener {
                         override fun onValidate() {
@@ -257,6 +263,9 @@ class ThreePidsSettingsController @Inject constructor(
                     id("msisdnVerification${threePid.value}")
                     inputType(InputType.TYPE_CLASS_NUMBER)
                     hint(stringProvider.getString(R.string.settings_text_message_sent_hint))
+                    if (data.msisdnValidationReinitiator[threePid]?.isTrue() == true) {
+                        value("")
+                    }
                     errorText(getCodeError(data, threePid))
                     interactionListener(object : SettingsEditTextItem.Listener {
                         override fun onValidate() {
diff --git a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewModel.kt
index 0501d77808..cf5d3feff7 100644
--- a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewModel.kt
@@ -29,6 +29,7 @@ import im.vector.app.R
 import im.vector.app.core.extensions.exhaustive
 import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.core.resources.StringProvider
+import im.vector.app.core.utils.ReadOnceTrue
 import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.auth.data.LoginFlowTypes
@@ -124,7 +125,15 @@ class ThreePidsSettingsViewModel @AssistedInject constructor(
                 .livePendingThreePIds()
                 .execute {
                     copy(
-                            pendingThreePids = it
+                            pendingThreePids = it,
+                            // Ensure the editText for code will be reset
+                            msisdnValidationReinitiator = msisdnValidationReinitiator.toMutableMap().apply {
+                                it.invoke()
+                                        ?.filterIsInstance(ThreePid.Msisdn::class.java)
+                                        ?.forEach { threePid ->
+                                            getOrPut(threePid) { ReadOnceTrue() }
+                                        }
+                            }
                     )
                 }
     }
@@ -177,7 +186,8 @@ class ThreePidsSettingsViewModel @AssistedInject constructor(
     private fun handleChangeState(action: ThreePidsSettingsAction.ChangeState) {
         setState {
             copy(
-                    state = action.newState
+                    state = action.newState,
+                    editTextReinitiator = ReadOnceTrue()
             )
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewState.kt b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewState.kt
index 4233ee1005..2b3bdf21ad 100644
--- a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewState.kt
@@ -19,6 +19,7 @@ package im.vector.app.features.settings.threepids
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.MvRxState
 import com.airbnb.mvrx.Uninitialized
+import im.vector.app.core.utils.ReadOnceTrue
 import org.matrix.android.sdk.api.session.identity.ThreePid
 
 data class ThreePidsSettingsViewState(
@@ -26,5 +27,7 @@ data class ThreePidsSettingsViewState(
         val isLoading: Boolean = false,
         val threePids: Async<List<ThreePid>> = Uninitialized,
         val pendingThreePids: Async<List<ThreePid>> = Uninitialized,
-        val msisdnValidationRequests: Map<String, Async<Unit>> = emptyMap()
+        val msisdnValidationRequests: Map<String, Async<Unit>> = emptyMap(),
+        val editTextReinitiator: ReadOnceTrue? = null,
+        val msisdnValidationReinitiator: Map<ThreePid, ReadOnceTrue> = emptyMap()
 ) : MvRxState

From 99343294c63d058ee2e78fb387ccfaad8610f4d4 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 1 Sep 2020 10:09:28 +0200
Subject: [PATCH 28/47] Rename class

---
 .../threepids/ThreePidsSettingsAction.kt      |  2 +-
 .../threepids/ThreePidsSettingsController.kt  | 22 +++++++++----------
 .../threepids/ThreePidsSettingsFragment.kt    | 18 +++++++--------
 ...gsState.kt => ThreePidsSettingsUiState.kt} |  8 +++----
 .../threepids/ThreePidsSettingsViewModel.kt   |  8 +++----
 .../threepids/ThreePidsSettingsViewState.kt   |  2 +-
 6 files changed, 30 insertions(+), 30 deletions(-)
 rename vector/src/main/java/im/vector/app/features/settings/threepids/{ThreePidsSettingsState.kt => ThreePidsSettingsUiState.kt} (87%)

diff --git a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsAction.kt b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsAction.kt
index d3df4b6e75..0be3c6a198 100644
--- a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsAction.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsAction.kt
@@ -20,7 +20,7 @@ import im.vector.app.core.platform.VectorViewModelAction
 import org.matrix.android.sdk.api.session.identity.ThreePid
 
 sealed class ThreePidsSettingsAction : VectorViewModelAction {
-    data class ChangeState(val newState: ThreePidsSettingsState) : ThreePidsSettingsAction()
+    data class ChangeUiState(val newUiState: ThreePidsSettingsUiState) : ThreePidsSettingsAction()
     data class AddThreePid(val threePid: ThreePid) : ThreePidsSettingsAction()
     data class SubmitCode(val threePid: ThreePid.Msisdn, val code: String) : ThreePidsSettingsAction()
     data class ContinueThreePid(val threePid: ThreePid) : ThreePidsSettingsAction()
diff --git a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsController.kt b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsController.kt
index fa0be356a0..8f635f8812 100644
--- a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsController.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsController.kt
@@ -72,7 +72,7 @@ class ThreePidsSettingsController @Inject constructor(
     override fun buildModels(data: ThreePidsSettingsViewState?) {
         if (data == null) return
 
-        if (data.state is ThreePidsSettingsState.Idle) {
+        if (data.uiState is ThreePidsSettingsUiState.Idle) {
             currentInputValue = ""
         }
 
@@ -123,15 +123,15 @@ class ThreePidsSettingsController @Inject constructor(
                     pendingList.forEach { buildPendingThreePid(data, "p_email ", it) }
                 }
 
-        when (data.state) {
-            ThreePidsSettingsState.Idle ->
+        when (data.uiState) {
+            ThreePidsSettingsUiState.Idle                 ->
                 genericButtonItem {
                     id("addEmail")
                     text(stringProvider.getString(R.string.settings_add_email_address))
                     textColor(colorProvider.getColor(R.color.riotx_accent))
                     buttonClickAction(View.OnClickListener { interactionListener?.addEmail() })
                 }
-            is ThreePidsSettingsState.AddingEmail -> {
+            is ThreePidsSettingsUiState.AddingEmail       -> {
                 settingsEditTextItem {
                     id("addingEmail")
                     inputType(InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS)
@@ -139,7 +139,7 @@ class ThreePidsSettingsController @Inject constructor(
                     if (data.editTextReinitiator?.isTrue() == true) {
                         value("")
                     }
-                    errorText(data.state.error)
+                    errorText(data.uiState.error)
                     interactionListener(object : SettingsEditTextItem.Listener {
                         override fun onValidate() {
                             interactionListener?.doAddEmail(currentInputValue)
@@ -156,7 +156,7 @@ class ThreePidsSettingsController @Inject constructor(
                     cancelOnClick { interactionListener?.cancelAdding() }
                 }
             }
-            is ThreePidsSettingsState.AddingPhoneNumber -> Unit
+            is ThreePidsSettingsUiState.AddingPhoneNumber -> Unit
         }.exhaustive
 
         settingsSectionTitleItem {
@@ -181,16 +181,16 @@ class ThreePidsSettingsController @Inject constructor(
                     pendingList.forEach { buildPendingThreePid(data, "p_msisdn ", it) }
                 }
 
-        when (data.state) {
-            ThreePidsSettingsState.Idle ->
+        when (data.uiState) {
+            ThreePidsSettingsUiState.Idle                 ->
                 genericButtonItem {
                     id("addMsisdn")
                     text(stringProvider.getString(R.string.settings_add_phone_number))
                     textColor(colorProvider.getColor(R.color.riotx_accent))
                     buttonClickAction(View.OnClickListener { interactionListener?.addMsisdn() })
                 }
-            is ThreePidsSettingsState.AddingEmail -> Unit
-            is ThreePidsSettingsState.AddingPhoneNumber -> {
+            is ThreePidsSettingsUiState.AddingEmail       -> Unit
+            is ThreePidsSettingsUiState.AddingPhoneNumber -> {
                 settingsInfoItem {
                     id("addingMsisdnInfo")
                     helperText(stringProvider.getString(R.string.login_msisdn_notice))
@@ -202,7 +202,7 @@ class ThreePidsSettingsController @Inject constructor(
                     if (data.editTextReinitiator?.isTrue() == true) {
                         value("")
                     }
-                    errorText(data.state.error)
+                    errorText(data.uiState.error)
                     interactionListener(object : SettingsEditTextItem.Listener {
                         override fun onValidate() {
                             interactionListener?.doAddMsisdn(currentInputValue)
diff --git a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsFragment.kt b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsFragment.kt
index 5c8e4e7b5d..519b7132bf 100644
--- a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsFragment.kt
@@ -92,17 +92,17 @@ class ThreePidsSettingsFragment @Inject constructor(
     }
 
     override fun addEmail() {
-        viewModel.handle(ThreePidsSettingsAction.ChangeState(ThreePidsSettingsState.AddingEmail(null)))
+        viewModel.handle(ThreePidsSettingsAction.ChangeUiState(ThreePidsSettingsUiState.AddingEmail(null)))
     }
 
     override fun doAddEmail(email: String) {
         // Sanity
         val safeEmail = email.trim().replace(" ", "")
-        viewModel.handle(ThreePidsSettingsAction.ChangeState(ThreePidsSettingsState.AddingEmail(null)))
+        viewModel.handle(ThreePidsSettingsAction.ChangeUiState(ThreePidsSettingsUiState.AddingEmail(null)))
 
         // Check that email is valid
         if (!safeEmail.isEmail()) {
-            viewModel.handle(ThreePidsSettingsAction.ChangeState(ThreePidsSettingsState.AddingEmail(getString(R.string.auth_invalid_email))))
+            viewModel.handle(ThreePidsSettingsAction.ChangeUiState(ThreePidsSettingsUiState.AddingEmail(getString(R.string.auth_invalid_email))))
             return
         }
 
@@ -110,26 +110,26 @@ class ThreePidsSettingsFragment @Inject constructor(
     }
 
     override fun addMsisdn() {
-        viewModel.handle(ThreePidsSettingsAction.ChangeState(ThreePidsSettingsState.AddingPhoneNumber(null)))
+        viewModel.handle(ThreePidsSettingsAction.ChangeUiState(ThreePidsSettingsUiState.AddingPhoneNumber(null)))
     }
 
     override fun doAddMsisdn(msisdn: String) {
         // Sanity
         val safeMsisdn = msisdn.trim().replace(" ", "")
 
-        viewModel.handle(ThreePidsSettingsAction.ChangeState(ThreePidsSettingsState.AddingPhoneNumber(null)))
+        viewModel.handle(ThreePidsSettingsAction.ChangeUiState(ThreePidsSettingsUiState.AddingPhoneNumber(null)))
 
         // Check that phone number is valid
         if (!msisdn.startsWith("+")) {
             viewModel.handle(
-                    ThreePidsSettingsAction.ChangeState(ThreePidsSettingsState.AddingPhoneNumber(getString(R.string.login_msisdn_error_not_international)))
+                    ThreePidsSettingsAction.ChangeUiState(ThreePidsSettingsUiState.AddingPhoneNumber(getString(R.string.login_msisdn_error_not_international)))
             )
             return
         }
 
         if (!msisdn.isMsisdn()) {
             viewModel.handle(
-                    ThreePidsSettingsAction.ChangeState(ThreePidsSettingsState.AddingPhoneNumber(getString(R.string.login_msisdn_error_other)))
+                    ThreePidsSettingsAction.ChangeUiState(ThreePidsSettingsUiState.AddingPhoneNumber(getString(R.string.login_msisdn_error_other)))
             )
             return
         }
@@ -144,7 +144,7 @@ class ThreePidsSettingsFragment @Inject constructor(
     }
 
     override fun cancelAdding() {
-        viewModel.handle(ThreePidsSettingsAction.ChangeState(ThreePidsSettingsState.Idle))
+        viewModel.handle(ThreePidsSettingsAction.ChangeUiState(ThreePidsSettingsUiState.Idle))
         // Hide the keyboard
         view?.hideKeyboard()
     }
@@ -170,7 +170,7 @@ class ThreePidsSettingsFragment @Inject constructor(
 
     override fun onBackPressed(toolbarButton: Boolean): Boolean {
         return withState(viewModel) {
-            if (it.state is ThreePidsSettingsState.Idle) {
+            if (it.uiState is ThreePidsSettingsUiState.Idle) {
                 false
             } else {
                 cancelAdding()
diff --git a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsState.kt b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsUiState.kt
similarity index 87%
rename from vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsState.kt
rename to vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsUiState.kt
index 32a685b697..d7e427acf3 100644
--- a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsState.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsUiState.kt
@@ -16,8 +16,8 @@
 
 package im.vector.app.features.settings.threepids
 
-sealed class ThreePidsSettingsState {
-    object Idle : ThreePidsSettingsState()
-    data class AddingEmail(val error: String?) : ThreePidsSettingsState()
-    data class AddingPhoneNumber(val error: String?) : ThreePidsSettingsState()
+sealed class ThreePidsSettingsUiState {
+    object Idle : ThreePidsSettingsUiState()
+    data class AddingEmail(val error: String?) : ThreePidsSettingsUiState()
+    data class AddingPhoneNumber(val error: String?) : ThreePidsSettingsUiState()
 }
diff --git a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewModel.kt
index cf5d3feff7..8c27ccd6ae 100644
--- a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewModel.kt
@@ -146,7 +146,7 @@ class ThreePidsSettingsViewModel @AssistedInject constructor(
             is ThreePidsSettingsAction.CancelThreePid -> handleCancelThreePid(action)
             is ThreePidsSettingsAction.AccountPassword -> handleAccountPassword(action)
             is ThreePidsSettingsAction.DeleteThreePid -> handleDeleteThreePid(action)
-            is ThreePidsSettingsAction.ChangeState -> handleChangeState(action)
+            is ThreePidsSettingsAction.ChangeUiState -> handleChangeUiState(action)
         }.exhaustive
     }
 
@@ -183,10 +183,10 @@ class ThreePidsSettingsViewModel @AssistedInject constructor(
         }
     }
 
-    private fun handleChangeState(action: ThreePidsSettingsAction.ChangeState) {
+    private fun handleChangeUiState(action: ThreePidsSettingsAction.ChangeUiState) {
         setState {
             copy(
-                    state = action.newState,
+                    uiState = action.newUiState,
                     editTextReinitiator = ReadOnceTrue()
             )
         }
@@ -211,7 +211,7 @@ class ThreePidsSettingsViewModel @AssistedInject constructor(
                             // Also reset the state
                             setState {
                                 copy(
-                                        state = ThreePidsSettingsState.Idle
+                                        uiState = ThreePidsSettingsUiState.Idle
                                 )
                             }
                             loadingCallback.onSuccess(data)
diff --git a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewState.kt b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewState.kt
index 2b3bdf21ad..9e9c8d3092 100644
--- a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewState.kt
@@ -23,7 +23,7 @@ import im.vector.app.core.utils.ReadOnceTrue
 import org.matrix.android.sdk.api.session.identity.ThreePid
 
 data class ThreePidsSettingsViewState(
-        val state: ThreePidsSettingsState = ThreePidsSettingsState.Idle,
+        val uiState: ThreePidsSettingsUiState = ThreePidsSettingsUiState.Idle,
         val isLoading: Boolean = false,
         val threePids: Async<List<ThreePid>> = Uninitialized,
         val pendingThreePids: Async<List<ThreePid>> = Uninitialized,

From 35f854de5db98526fad370d6367d4a9a345d20ac Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 1 Sep 2020 10:45:48 +0200
Subject: [PATCH 29/47] Also request focus (keyboard is not shown on my device
 :/)

---
 .../vector/app/features/discovery/SettingsEditTextItem.kt   | 5 +++++
 .../settings/threepids/ThreePidsSettingsController.kt       | 6 ++++--
 .../settings/threepids/ThreePidsSettingsViewState.kt        | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/discovery/SettingsEditTextItem.kt b/vector/src/main/java/im/vector/app/features/discovery/SettingsEditTextItem.kt
index 99303a8934..ad139309ac 100644
--- a/vector/src/main/java/im/vector/app/features/discovery/SettingsEditTextItem.kt
+++ b/vector/src/main/java/im/vector/app/features/discovery/SettingsEditTextItem.kt
@@ -27,12 +27,14 @@ import com.google.android.material.textfield.TextInputLayout
 import im.vector.app.R
 import im.vector.app.core.epoxy.VectorEpoxyHolder
 import im.vector.app.core.extensions.setTextOrHide
+import im.vector.app.core.extensions.showKeyboard
 
 @EpoxyModelClass(layout = R.layout.item_settings_edit_text)
 abstract class SettingsEditTextItem : EpoxyModelWithHolder<SettingsEditTextItem.Holder>() {
 
     @EpoxyAttribute var hint: String? = null
     @EpoxyAttribute var value: String? = null
+    @EpoxyAttribute var requestFocus = false
     @EpoxyAttribute var descriptionText: String? = null
     @EpoxyAttribute var errorText: String? = null
     @EpoxyAttribute var inProgress: Boolean = false
@@ -74,6 +76,9 @@ abstract class SettingsEditTextItem : EpoxyModelWithHolder<SettingsEditTextItem.
         if (value != null) {
             holder.editText.setText(value)
         }
+        if (requestFocus) {
+            holder.editText.showKeyboard(andRequestFocus = true)
+        }
     }
 
     class Holder : VectorEpoxyHolder() {
diff --git a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsController.kt b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsController.kt
index 8f635f8812..f07e31bb2e 100644
--- a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsController.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsController.kt
@@ -136,8 +136,9 @@ class ThreePidsSettingsController @Inject constructor(
                     id("addingEmail")
                     inputType(InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS)
                     hint(stringProvider.getString(R.string.medium_email))
-                    if (data.editTextReinitiator?.isTrue() == true) {
+                    if (data.editTextReinitiator.isTrue()) {
                         value("")
+                        requestFocus(true)
                     }
                     errorText(data.uiState.error)
                     interactionListener(object : SettingsEditTextItem.Listener {
@@ -199,8 +200,9 @@ class ThreePidsSettingsController @Inject constructor(
                     id("addingMsisdn")
                     inputType(InputType.TYPE_CLASS_PHONE)
                     hint(stringProvider.getString(R.string.medium_phone_number))
-                    if (data.editTextReinitiator?.isTrue() == true) {
+                    if (data.editTextReinitiator.isTrue()) {
                         value("")
+                        requestFocus(true)
                     }
                     errorText(data.uiState.error)
                     interactionListener(object : SettingsEditTextItem.Listener {
diff --git a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewState.kt b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewState.kt
index 9e9c8d3092..b080c06cbd 100644
--- a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewState.kt
@@ -28,6 +28,6 @@ data class ThreePidsSettingsViewState(
         val threePids: Async<List<ThreePid>> = Uninitialized,
         val pendingThreePids: Async<List<ThreePid>> = Uninitialized,
         val msisdnValidationRequests: Map<String, Async<Unit>> = emptyMap(),
-        val editTextReinitiator: ReadOnceTrue? = null,
+        val editTextReinitiator: ReadOnceTrue = ReadOnceTrue(),
         val msisdnValidationReinitiator: Map<ThreePid, ReadOnceTrue> = emptyMap()
 ) : MvRxState

From 1a452a6cd73064b80db95c3d7bf0fca631135688 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 1 Sep 2020 12:58:53 +0200
Subject: [PATCH 30/47] Improve error for non supported SSO flow to delete
 device or add MSISDN

---
 .../vector/app/core/error/ErrorFormatter.kt   |  1 +
 .../app/core/error/SsoFlowNotSupportedYet.kt  | 19 +++++++++++++++++++
 .../settings/devices/DevicesViewModel.kt      |  3 ++-
 .../threepids/ThreePidsSettingsViewModel.kt   |  3 ++-
 vector/src/main/res/values/strings.xml        |  2 ++
 5 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 vector/src/main/java/im/vector/app/core/error/SsoFlowNotSupportedYet.kt

diff --git a/vector/src/main/java/im/vector/app/core/error/ErrorFormatter.kt b/vector/src/main/java/im/vector/app/core/error/ErrorFormatter.kt
index 2cd27e4ae5..f6c251ddd7 100644
--- a/vector/src/main/java/im/vector/app/core/error/ErrorFormatter.kt
+++ b/vector/src/main/java/im/vector/app/core/error/ErrorFormatter.kt
@@ -109,6 +109,7 @@ class DefaultErrorFormatter @Inject constructor(
                         throwable.localizedMessage
                 }
             }
+            is SsoFlowNotSupportedYet    -> stringProvider.getString(R.string.error_sso_flow_not_supported_yet)
             else                         -> throwable.localizedMessage
         }
                 ?: stringProvider.getString(R.string.unknown_error)
diff --git a/vector/src/main/java/im/vector/app/core/error/SsoFlowNotSupportedYet.kt b/vector/src/main/java/im/vector/app/core/error/SsoFlowNotSupportedYet.kt
new file mode 100644
index 0000000000..7b22072c34
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/core/error/SsoFlowNotSupportedYet.kt
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.core.error
+
+class SsoFlowNotSupportedYet : Throwable()
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewModel.kt
index 37a0d392a1..8c5762afce 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewModel.kt
@@ -28,6 +28,7 @@ import com.airbnb.mvrx.Uninitialized
 import com.airbnb.mvrx.ViewModelContext
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
+import im.vector.app.core.error.SsoFlowNotSupportedYet
 import im.vector.app.core.platform.VectorViewModel
 import io.reactivex.Observable
 import io.reactivex.functions.BiFunction
@@ -316,7 +317,7 @@ class DevicesViewModel @AssistedInject constructor(
                         )
                     }
 
-                    _viewEvents.post(DevicesViewEvents.Failure(failure))
+                    _viewEvents.post(DevicesViewEvents.Failure(SsoFlowNotSupportedYet()))
                 }
             }
 
diff --git a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewModel.kt
index 8c27ccd6ae..2001c85a2e 100644
--- a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewModel.kt
@@ -26,6 +26,7 @@ import com.airbnb.mvrx.ViewModelContext
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
 import im.vector.app.R
+import im.vector.app.core.error.SsoFlowNotSupportedYet
 import im.vector.app.core.extensions.exhaustive
 import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.core.resources.StringProvider
@@ -66,7 +67,7 @@ class ThreePidsSettingsViewModel @AssistedInject constructor(
                     _viewEvents.post(ThreePidsSettingsViewEvents.RequestPassword)
                 } else {
                     // LoginFlowTypes.PASSWORD not supported, and this is the only one Element supports so far...
-                    _viewEvents.post(ThreePidsSettingsViewEvents.Failure(failure))
+                    _viewEvents.post(ThreePidsSettingsViewEvents.Failure(SsoFlowNotSupportedYet()))
                 }
             } else {
                 _viewEvents.post(ThreePidsSettingsViewEvents.Failure(failure))
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 74a60a969d..af9f6b1fd3 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -2427,6 +2427,8 @@
     <string name="confirm_your_identity">Confirm your identity by verifying this login from one of your other sessions, granting it access to encrypted messages.</string>
     <string name="mark_as_verified">Mark as Trusted</string>
 
+    <string name="error_sso_flow_not_supported_yet">Sorry, this operation is not possible yet for accounts connected using Single Sign-On.</string>
+
     <string name="error_empty_field_choose_user_name">Please choose a username.</string>
     <string name="error_empty_field_choose_password">Please choose a password.</string>
     <string name="external_link_confirmation_title">Double-check this link</string>

From c6bd6c17fceb4e79ac2788d361635f6d810f7bcd Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 1 Sep 2020 14:55:12 +0200
Subject: [PATCH 31/47] Auto review

---
 CHANGES.md                                                    | 2 +-
 .../matrix/android/sdk/api/session/profile/ProfileService.kt  | 4 ++--
 .../src/main/java/im/vector/app/core/error/ErrorFormatter.kt  | 4 ++++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 9bd7a8be6b..93311f1860 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -2,7 +2,7 @@ Changes in Element 1.0.6 (2020-XX-XX)
 ===================================================
 
 Features ✨:
- - List phone numbers and emails added to the Matrix account, and add Email adn phone numbers to account (#44, #45)
+ - List phone numbers and emails added to the Matrix account, and add emails and phone numbers to account (#44, #45)
 
 Improvements 🙌:
  - You can now join room through permalink and within room directory search
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/profile/ProfileService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/profile/ProfileService.kt
index 8742c9e7d0..15066cc4a6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/profile/ProfileService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/profile/ProfileService.kt
@@ -113,13 +113,13 @@ interface ProfileService {
                                matrixCallback: MatrixCallback<Unit>): Cancelable
 
     /**
-     * Cancel adding a threepid. It will remove data store locally about this ThreePid
+     * Cancel adding a threepid. It will remove locally stored data about this ThreePid
      */
     fun cancelAddingThreePid(threePid: ThreePid,
                              matrixCallback: MatrixCallback<Unit>): Cancelable
 
     /**
-     * Delete a 3Pids.
+     * Remove a 3Pid from the Matrix account.
      */
     fun deleteThreePid(threePid: ThreePid, matrixCallback: MatrixCallback<Unit>): Cancelable
 }
diff --git a/vector/src/main/java/im/vector/app/core/error/ErrorFormatter.kt b/vector/src/main/java/im/vector/app/core/error/ErrorFormatter.kt
index f6c251ddd7..43395b97f7 100644
--- a/vector/src/main/java/im/vector/app/core/error/ErrorFormatter.kt
+++ b/vector/src/main/java/im/vector/app/core/error/ErrorFormatter.kt
@@ -91,6 +91,10 @@ class DefaultErrorFormatter @Inject constructor(
                             && throwable.error.message == "Email is already in use" -> {
                         stringProvider.getString(R.string.account_email_already_used_error)
                     }
+                    throwable.error.code == MatrixError.M_THREEPID_IN_USE
+                            && throwable.error.message == "MSISDN is already in use" -> {
+                        stringProvider.getString(R.string.account_phone_number_already_used_error)
+                    }
                     throwable.error.code == MatrixError.M_THREEPID_AUTH_FAILED      -> {
                         stringProvider.getString(R.string.error_threepid_auth_failed)
                     }

From 3dc69b60c45a98d10ca22b6d4054f02bf1ec90df Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Tue, 1 Sep 2020 17:31:54 +0200
Subject: [PATCH 32/47] Fix / Log could leak file name

---
 .../main/java/im/vector/lib/attachmentviewer/VideoViewHolder.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoViewHolder.kt b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoViewHolder.kt
index 621f04426d..8c5dff07f8 100644
--- a/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoViewHolder.kt
+++ b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoViewHolder.kt
@@ -123,7 +123,7 @@ class VideoViewHolder constructor(itemView: View) :
             videoView.setVideoPath(mVideoPath)
         } catch (failure: Throwable) {
             // Couldn't open
-            Log.v(VideoViewHolder::class.java.name, "Failed to start video ${failure.message}")
+            Log.v(VideoViewHolder::class.java.name, "Failed to start video")
         }
 
         if (!wasPaused) {

From 971320a56c6bedc5684ffc34107d3009a8b9850f Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 1 Sep 2020 18:38:38 +0200
Subject: [PATCH 33/47] Restore setting removed by mistake

---
 vector/src/main/res/xml/vector_settings_general.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/vector/src/main/res/xml/vector_settings_general.xml b/vector/src/main/res/xml/vector_settings_general.xml
index 5a9d016842..c1fe82e4c2 100644
--- a/vector/src/main/res/xml/vector_settings_general.xml
+++ b/vector/src/main/res/xml/vector_settings_general.xml
@@ -3,7 +3,6 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools">
 
-
     <im.vector.app.core.preference.VectorPreferenceCategory
         android:key="SETTINGS_USER_SETTINGS_PREFERENCE_KEY"
         android:title="@string/settings_user_settings">
@@ -28,6 +27,12 @@
             android:title="@string/settings_emails_and_phone_numbers_title"
             app:fragment="im.vector.app.features.settings.threepids.ThreePidsSettingsFragment" />
 
+        <im.vector.app.core.preference.VectorPreference
+            android:persistent="false"
+            android:summary="@string/settings_discovery_manage"
+            android:title="@string/settings_discovery_category"
+            app:fragment="im.vector.app.features.discovery.DiscoverySettingsFragment" />
+
     </im.vector.app.core.preference.VectorPreferenceCategory>
 
     <im.vector.app.core.preference.VectorPreferenceCategory

From 9e20f7db1a73ff535eb129fde6d3199c5a627a41 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 1 Sep 2020 18:49:08 +0200
Subject: [PATCH 34/47] Update of Buildkite configuration: New pipeline
 location:
 https://github.com/matrix-org/pipelines/blob/master/element-android/pipeline.yml
 New build location: https://buildkite.com/matrix-dot-org/element-android

---
 CHANGES.md                                    | 4 ++++
 README.md                                     | 4 ++--
 build.gradle                                  | 2 +-
 tools/release/download_buildkite_artifacts.py | 4 ++--
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 1448d53a07..9a41f3c4ef 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -29,6 +29,10 @@ SDK API changes ⚠️:
 
 Build 🧱:
  - Some dependencies have been upgraded (coroutine, recyclerView, appCompat, core-ktx, firebase-messaging)
+ - Buildkite:
+    New pipeline location: https://github.com/matrix-org/pipelines/blob/master/element-android/pipeline.yml
+    New build location: https://buildkite.com/matrix-dot-org/element-android
+
 
 Other changes:
  - Use File extension functions to make code more concise (#1996)
diff --git a/README.md b/README.md
index 9f31e83ef6..64c6c9d04d 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[![Buildkite](https://badge.buildkite.com/657d3db27364448d69d54f66c690f7788bc6aa80a7628e37f3.svg?branch=develop)](https://buildkite.com/matrix-dot-org/riotx-android/builds?branch=develop)
+[![Buildkite](https://badge.buildkite.com/ad0065c1b70f557cd3b1d3d68f9c2154010f83c4d6f71706a9.svg?branch=develop)](https://buildkite.com/matrix-dot-org/element-android/builds?branch=develop)
 [![Weblate](https://translate.riot.im/widgets/element-android/-/svg-badge.svg)](https://translate.riot.im/engage/element-android/?utm_source=widget)
 [![Element Android Matrix room #element-android:matrix.org](https://img.shields.io/matrix/element-android:matrix.org.svg?label=%23element-android:matrix.org&logo=matrix&server_fqdn=matrix.org)](https://matrix.to/#/#element-android:matrix.org)
 [![Quality Gate](https://sonarcloud.io/api/project_badges/measure?project=im.vector.app.android&metric=alert_status)](https://sonarcloud.io/dashboard?id=im.vector.app.android)
@@ -14,7 +14,7 @@ It is a total rewrite of [Riot-Android](https://github.com/vector-im/riot-androi
 [<img src="resources/img/google-play-badge.png" alt="Get it on Google Play" height="60">](https://play.google.com/store/apps/details?id=im.vector.app)
 [<img src="resources/img/f-droid-badge.png" alt="Get it on F-Droid" height="60">](https://f-droid.org/app/im.vector.app)
 
-Nightly build: [![Buildkite](https://badge.buildkite.com/657d3db27364448d69d54f66c690f7788bc6aa80a7628e37f3.svg?branch=develop)](https://buildkite.com/matrix-dot-org/riotx-android/builds?branch=develop)
+Nightly build: [![Buildkite](https://badge.buildkite.com/ad0065c1b70f557cd3b1d3d68f9c2154010f83c4d6f71706a9.svg?branch=develop)](https://buildkite.com/matrix-dot-org/element-android/builds?branch=develop)
 
 # New Android SDK
 
diff --git a/build.gradle b/build.gradle
index 061dd73a40..f06d1859b5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -87,7 +87,7 @@ sonarqube {
         property "sonar.projectVersion", project(":vector").android.defaultConfig.versionName
         property "sonar.sourceEncoding", "UTF-8"
         property "sonar.links.homepage", "https://github.com/vector-im/element-android/"
-        property "sonar.links.ci", "https://buildkite.com/matrix-dot-org/riotx-android"
+        property "sonar.links.ci", "https://buildkite.com/matrix-dot-org/element-android"
         property "sonar.links.scm", "https://github.com/vector-im/element-android/"
         property "sonar.links.issue", "https://github.com/vector-im/element-android/issues"
         property "sonar.organization", "new_vector_ltd_organization"
diff --git a/tools/release/download_buildkite_artifacts.py b/tools/release/download_buildkite_artifacts.py
index ef4251a14f..4439c2fb8c 100755
--- a/tools/release/download_buildkite_artifacts.py
+++ b/tools/release/download_buildkite_artifacts.py
@@ -25,9 +25,9 @@ import requests
 # This script downloads artifacts from buildkite.
 # Ref: https://buildkite.com/docs/apis/rest-api/artifacts#download-an-artifact
 
-# Those two variable are specific to the RiotX project
+# Those two variables are specific to the Element Android project
 ORG_SLUG = "matrix-dot-org"
-PIPELINE_SLUG = "riotx-android"
+PIPELINE_SLUG = "element-android"
 
 ### Arguments
 

From 29123ac726efbf64fa04339246a2f6be5f6a2eb8 Mon Sep 17 00:00:00 2001
From: Leon Schmidt <50419884+MexHigh@users.noreply.github.com>
Date: Tue, 1 Sep 2020 22:02:16 +0200
Subject: [PATCH 35/47] Bugfix/markdown parsing (#2002)

Removed replacing of newlines in already parsed HTML documents

Signed-off-by: Leon Schmidt <mail@leon.wtf>

Co-authored-by: Benoit Marty <benoitm@matrix.org>
---
 CHANGES.md                                       |  1 +
 .../internal/session/room/send/MarkdownParser.kt | 16 ++--------------
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 9a41f3c4ef..86b796869e 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,7 @@ Improvements 🙌:
 
 Bugfix 🐛:
  - Display name not shown under Settings/General (#1926)
+ - Wrong markdown parsing (#350, #1375, #1939, #1982)
  - Words containing my name should not trigger notifications (#1781)
  - Fix changing language issue
  - Fix FontSize issue (#1483, #1787)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParser.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParser.kt
index 3390d9dc79..233ba9bc42 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParser.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParser.kt
@@ -33,7 +33,7 @@ internal class MarkdownParser @Inject constructor(
         private val textContentRenderer: TextContentRenderer
 ) {
 
-    private val mdSpecialChars = "[`_\\-\\*>\\.\\[\\]#~]".toRegex()
+    private val mdSpecialChars = "[`_\\-*>.\\[\\]#~]".toRegex()
 
     fun parse(text: String): TextContent {
         // If no special char are detected, just return plain text
@@ -54,8 +54,7 @@ internal class MarkdownParser @Inject constructor(
         return if (isFormattedTextPertinent(text, cleanHtmlText)) {
             // According to https://matrix.org/docs/spec/client_server/latest#m-room-message-msgtypes:
             // The plain text version of the HTML should be provided in the body.
-            val plainText = textContentRenderer.render(document)
-            TextContent(plainText, cleanHtmlText.postTreatment())
+            TextContent(text, cleanHtmlText.trim())
         } else {
             TextContent(text)
         }
@@ -63,15 +62,4 @@ internal class MarkdownParser @Inject constructor(
 
     private fun isFormattedTextPertinent(text: String, htmlText: String?) =
             text != htmlText && htmlText != "<p>${text.trim()}</p>\n"
-
-    /**
-     * The parser makes some mistakes, so deal with it here
-     */
-    private fun String.postTreatment(): String {
-        return this
-                // Remove extra space before and after the content
-                .trim()
-                // There is no need to include new line in an html-like source
-                .replace("\n", "")
-    }
 }

From 6c943571fce958afb97530a032930ac44e4d9cbf Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 1 Sep 2020 22:22:27 +0200
Subject: [PATCH 36/47] Remove useless TextContentRenderer

---
 .../session/room/send/MarkdownParserTest.kt         |  6 ++----
 .../android/sdk/internal/session/room/RoomModule.kt | 13 ++-----------
 .../internal/session/room/send/MarkdownParser.kt    |  4 +---
 3 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParserTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParserTest.kt
index 9b85310d50..c6f80a8ef0 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParserTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParserTest.kt
@@ -17,15 +17,14 @@
 package org.matrix.android.sdk.internal.session.room.send
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import org.matrix.android.sdk.InstrumentedTest
 import org.commonmark.parser.Parser
 import org.commonmark.renderer.html.HtmlRenderer
-import org.commonmark.renderer.text.TextContentRenderer
 import org.junit.Assert.assertEquals
 import org.junit.FixMethodOrder
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.MethodSorters
+import org.matrix.android.sdk.InstrumentedTest
 
 /**
  * It will not be possible to test all combinations. For the moment I add a few tests, then, depending on the problem discovered in the wild,
@@ -46,8 +45,7 @@ class MarkdownParserTest : InstrumentedTest {
      */
     private val markdownParser = MarkdownParser(
             Parser.builder().build(),
-            HtmlRenderer.builder().build(),
-            TextContentRenderer.builder().build()
+            HtmlRenderer.builder().build()
     )
 
     @Test
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomModule.kt
index 7f21ee84f6..700507735b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomModule.kt
@@ -20,6 +20,8 @@ package org.matrix.android.sdk.internal.session.room
 import dagger.Binds
 import dagger.Module
 import dagger.Provides
+import org.commonmark.parser.Parser
+import org.commonmark.renderer.html.HtmlRenderer
 import org.matrix.android.sdk.api.session.file.FileService
 import org.matrix.android.sdk.api.session.room.RoomDirectoryService
 import org.matrix.android.sdk.api.session.room.RoomService
@@ -75,9 +77,6 @@ import org.matrix.android.sdk.internal.session.room.typing.DefaultSendTypingTask
 import org.matrix.android.sdk.internal.session.room.typing.SendTypingTask
 import org.matrix.android.sdk.internal.session.room.uploads.DefaultGetUploadsTask
 import org.matrix.android.sdk.internal.session.room.uploads.GetUploadsTask
-import org.commonmark.parser.Parser
-import org.commonmark.renderer.html.HtmlRenderer
-import org.commonmark.renderer.text.TextContentRenderer
 import retrofit2.Retrofit
 
 @Module
@@ -105,14 +104,6 @@ internal abstract class RoomModule {
                     .builder()
                     .build()
         }
-
-        @Provides
-        @JvmStatic
-        fun providesTextContentRenderer(): TextContentRenderer {
-            return TextContentRenderer
-                    .builder()
-                    .build()
-        }
     }
 
     @Binds
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParser.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParser.kt
index 233ba9bc42..f535200c7e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParser.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParser.kt
@@ -19,7 +19,6 @@ package org.matrix.android.sdk.internal.session.room.send
 
 import org.commonmark.parser.Parser
 import org.commonmark.renderer.html.HtmlRenderer
-import org.commonmark.renderer.text.TextContentRenderer
 import javax.inject.Inject
 
 /**
@@ -29,8 +28,7 @@ import javax.inject.Inject
  */
 internal class MarkdownParser @Inject constructor(
         private val parser: Parser,
-        private val htmlRenderer: HtmlRenderer,
-        private val textContentRenderer: TextContentRenderer
+        private val htmlRenderer: HtmlRenderer
 ) {
 
     private val mdSpecialChars = "[`_\\-*>.\\[\\]#~]".toRegex()

From 484fd617064891e7de2bb4115391ff2c34ac3680 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 1 Sep 2020 22:33:38 +0200
Subject: [PATCH 37/47] Make MarkdownParserTest tests pass again

---
 .../session/room/send/MarkdownParserTest.kt   | 114 ++++++++++--------
 1 file changed, 61 insertions(+), 53 deletions(-)

diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParserTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParserTest.kt
index c6f80a8ef0..35d0bf6c86 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParserTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParserTest.kt
@@ -93,7 +93,7 @@ class MarkdownParserTest : InstrumentedTest {
     @Test
     fun parseItalic2() {
         // Riot-Web format
-        "_italic_".let { markdownParser.parse(it) }.expect("italic", "<em>italic</em>")
+        "_italic_".let { markdownParser.parse(it).expect(it, "<em>italic</em>") }
     }
 
     /**
@@ -113,9 +113,7 @@ class MarkdownParserTest : InstrumentedTest {
         testType(
                 name = "code",
                 markdownPattern = "`",
-                htmlExpectedTag = "code",
-                plainTextPrefix = "\"",
-                plainTextSuffix = "\""
+                htmlExpectedTag = "code"
         )
     }
 
@@ -124,9 +122,7 @@ class MarkdownParserTest : InstrumentedTest {
         testType(
                 name = "code",
                 markdownPattern = "``",
-                htmlExpectedTag = "code",
-                plainTextPrefix = "\"",
-                plainTextSuffix = "\""
+                htmlExpectedTag = "code"
         )
     }
 
@@ -135,9 +131,7 @@ class MarkdownParserTest : InstrumentedTest {
         testType(
                 name = "code",
                 markdownPattern = "```",
-                htmlExpectedTag = "code",
-                plainTextPrefix = "\"",
-                plainTextSuffix = "\""
+                htmlExpectedTag = "code"
         )
     }
 
@@ -155,58 +149,58 @@ class MarkdownParserTest : InstrumentedTest {
 
     @Test
     fun parseHorizontalLine() {
-        "---".let { markdownParser.parse(it) }.expect("***", "<hr />")
+        "---".let { markdownParser.parse(it).expect(it, "<hr />") }
     }
 
     @Test
     fun parseH2AndContent() {
-        "a\n---\nb".let { markdownParser.parse(it) }.expect("a\nb", "<h2>a</h2><p>b</p>")
+        "a\n---\nb".let { markdownParser.parse(it).expect(it, "<h2>a</h2><p>b</p>") }
     }
 
     @Test
     fun parseQuote() {
-        "> quoted".let { markdownParser.parse(it) }.expect("«quoted»", "<blockquote><p>quoted</p></blockquote>")
+        "> quoted".let { markdownParser.parse(it).expect(it, "<blockquote><p>quoted</p></blockquote>") }
     }
 
     @Test
     fun parseQuote_not_passing() {
-        "> quoted\nline2".let { markdownParser.parse(it) }.expect("«quoted\nline2»", "<blockquote><p>quoted<br/>line2</p></blockquote>")
+        "> quoted\nline2".let { markdownParser.parse(it).expect(it, "<blockquote><p>quoted<br/>line2</p></blockquote>") }
     }
 
     @Test
     fun parseBoldItalic() {
-        "*italic* **bold**".let { markdownParser.parse(it) }.expect("italic bold", "<em>italic</em> <strong>bold</strong>")
-        "**bold** *italic*".let { markdownParser.parse(it) }.expect("bold italic", "<strong>bold</strong> <em>italic</em>")
+        "*italic* **bold**".let { markdownParser.parse(it).expect(it, "<em>italic</em> <strong>bold</strong>") }
+        "**bold** *italic*".let { markdownParser.parse(it).expect(it, "<strong>bold</strong> <em>italic</em>") }
     }
 
     @Test
     fun parseHead() {
-        "# head1".let { markdownParser.parse(it) }.expect("head1", "<h1>head1</h1>")
-        "## head2".let { markdownParser.parse(it) }.expect("head2", "<h2>head2</h2>")
-        "### head3".let { markdownParser.parse(it) }.expect("head3", "<h3>head3</h3>")
-        "#### head4".let { markdownParser.parse(it) }.expect("head4", "<h4>head4</h4>")
-        "##### head5".let { markdownParser.parse(it) }.expect("head5", "<h5>head5</h5>")
-        "###### head6".let { markdownParser.parse(it) }.expect("head6", "<h6>head6</h6>")
+        "# head1".let { markdownParser.parse(it).expect(it, "<h1>head1</h1>") }
+        "## head2".let { markdownParser.parse(it).expect(it, "<h2>head2</h2>") }
+        "### head3".let { markdownParser.parse(it).expect(it, "<h3>head3</h3>") }
+        "#### head4".let { markdownParser.parse(it).expect(it, "<h4>head4</h4>") }
+        "##### head5".let { markdownParser.parse(it).expect(it, "<h5>head5</h5>") }
+        "###### head6".let { markdownParser.parse(it).expect(it, "<h6>head6</h6>") }
     }
 
     @Test
     fun parseHeads() {
-        "# head1\n# head2".let { markdownParser.parse(it) }.expect("head1\nhead2", "<h1>head1</h1><h1>head2</h1>")
+        "# head1\n# head2".let { markdownParser.parse(it).expect(it, "<h1>head1</h1><h1>head2</h1>") }
     }
 
     @Test
     fun parseBoldNewLines_not_passing() {
-        "**bold**\nline2".let { markdownParser.parse(it) }.expect("bold\nline2", "<strong>bold</strong><br />line2")
+        "**bold**\nline2".let { markdownParser.parse(it).expect(it, "<strong>bold</strong><br />line2") }
     }
 
     @Test
     fun parseLinks() {
-        "[link](target)".let { markdownParser.parse(it) }.expect(""""link" (target)""", """<a href="target">link</a>""")
+        "[link](target)".let { markdownParser.parse(it).expect(it, """<a href="target">link</a>""") }
     }
 
     @Test
     fun parseParagraph() {
-        "# head\ncontent".let { markdownParser.parse(it) }.expect("head\ncontent", "<h1>head</h1><p>content</p>")
+        "# head\ncontent".let { markdownParser.parse(it).expect(it, "<h1>head</h1><p>content</p>") }
     }
 
     private fun testIdentity(text: String) {
@@ -215,59 +209,73 @@ class MarkdownParserTest : InstrumentedTest {
 
     private fun testType(name: String,
                          markdownPattern: String,
-                         htmlExpectedTag: String,
-                         plainTextPrefix: String = "",
-                         plainTextSuffix: String = "") {
+                         htmlExpectedTag: String) {
         // Test simple case
         "$markdownPattern$name$markdownPattern"
-                .let { markdownParser.parse(it) }
-                .expect(expectedText = "$plainTextPrefix$name$plainTextSuffix",
-                        expectedFormattedText = "<$htmlExpectedTag>$name</$htmlExpectedTag>")
+                .let {
+                    markdownParser.parse(it)
+                            .expect(expectedText = it,
+                                    expectedFormattedText = "<$htmlExpectedTag>$name</$htmlExpectedTag>")
+                }
 
         // Test twice the same tag
         "$markdownPattern$name$markdownPattern and $markdownPattern$name bis$markdownPattern"
-                .let { markdownParser.parse(it) }
-                .expect(expectedText = "$plainTextPrefix$name$plainTextSuffix and $plainTextPrefix$name bis$plainTextSuffix",
-                        expectedFormattedText = "<$htmlExpectedTag>$name</$htmlExpectedTag> and <$htmlExpectedTag>$name bis</$htmlExpectedTag>")
+                .let {
+                    markdownParser.parse(it)
+                            .expect(expectedText = it,
+                                    expectedFormattedText = "<$htmlExpectedTag>$name</$htmlExpectedTag> and <$htmlExpectedTag>$name bis</$htmlExpectedTag>")
+                }
 
         val textBefore = "a"
         val textAfter = "b"
 
         // With sticked text before
         "$textBefore$markdownPattern$name$markdownPattern"
-                .let { markdownParser.parse(it) }
-                .expect(expectedText = "$textBefore$plainTextPrefix$name$plainTextSuffix",
-                        expectedFormattedText = "$textBefore<$htmlExpectedTag>$name</$htmlExpectedTag>")
+                .let {
+                    markdownParser.parse(it)
+                            .expect(expectedText = it,
+                                    expectedFormattedText = "$textBefore<$htmlExpectedTag>$name</$htmlExpectedTag>")
+                }
 
         // With text before and space
         "$textBefore $markdownPattern$name$markdownPattern"
-                .let { markdownParser.parse(it) }
-                .expect(expectedText = "$textBefore $plainTextPrefix$name$plainTextSuffix",
-                        expectedFormattedText = "$textBefore <$htmlExpectedTag>$name</$htmlExpectedTag>")
+                .let {
+                    markdownParser.parse(it)
+                            .expect(expectedText = it,
+                                    expectedFormattedText = "$textBefore <$htmlExpectedTag>$name</$htmlExpectedTag>")
+                }
 
         // With sticked text after
         "$markdownPattern$name$markdownPattern$textAfter"
-                .let { markdownParser.parse(it) }
-                .expect(expectedText = "$plainTextPrefix$name$plainTextSuffix$textAfter",
-                        expectedFormattedText = "<$htmlExpectedTag>$name</$htmlExpectedTag>$textAfter")
+                .let {
+                    markdownParser.parse(it)
+                            .expect(expectedText = it,
+                                    expectedFormattedText = "<$htmlExpectedTag>$name</$htmlExpectedTag>$textAfter")
+                }
 
         // With space and text after
         "$markdownPattern$name$markdownPattern $textAfter"
-                .let { markdownParser.parse(it) }
-                .expect(expectedText = "$plainTextPrefix$name$plainTextSuffix $textAfter",
-                        expectedFormattedText = "<$htmlExpectedTag>$name</$htmlExpectedTag> $textAfter")
+                .let {
+                    markdownParser.parse(it)
+                            .expect(expectedText = it,
+                                    expectedFormattedText = "<$htmlExpectedTag>$name</$htmlExpectedTag> $textAfter")
+                }
 
         // With sticked text before and text after
         "$textBefore$markdownPattern$name$markdownPattern$textAfter"
-                .let { markdownParser.parse(it) }
-                .expect(expectedText = "$textBefore$plainTextPrefix$name$plainTextSuffix$textAfter",
-                        expectedFormattedText = "a<$htmlExpectedTag>$name</$htmlExpectedTag>$textAfter")
+                .let {
+                    markdownParser.parse(it)
+                            .expect(expectedText = it,
+                                    expectedFormattedText = "a<$htmlExpectedTag>$name</$htmlExpectedTag>$textAfter")
+                }
 
         // With text before and after, with spaces
         "$textBefore $markdownPattern$name$markdownPattern $textAfter"
-                .let { markdownParser.parse(it) }
-                .expect(expectedText = "$textBefore $plainTextPrefix$name$plainTextSuffix $textAfter",
-                        expectedFormattedText = "$textBefore <$htmlExpectedTag>$name</$htmlExpectedTag> $textAfter")
+                .let {
+                    markdownParser.parse(it)
+                            .expect(expectedText = it,
+                                    expectedFormattedText = "$textBefore <$htmlExpectedTag>$name</$htmlExpectedTag> $textAfter")
+                }
     }
 
     private fun TextContent.expect(expectedText: String, expectedFormattedText: String?) {

From 9389cfe7a3e27631501d16e97493c1056a3cfd10 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 1 Sep 2020 22:52:16 +0200
Subject: [PATCH 38/47] Add comment for history

---
 .../android/sdk/internal/session/room/send/MarkdownParser.kt     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParser.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParser.kt
index f535200c7e..39ae35faa1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParser.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParser.kt
@@ -52,6 +52,7 @@ internal class MarkdownParser @Inject constructor(
         return if (isFormattedTextPertinent(text, cleanHtmlText)) {
             // According to https://matrix.org/docs/spec/client_server/latest#m-room-message-msgtypes:
             // The plain text version of the HTML should be provided in the body.
+            // But it caused too many problems so it has been removed in #2002
             TextContent(text, cleanHtmlText.trim())
         } else {
             TextContent(text)

From d0532bb9a902611bb7b85260693a7c24baab5433 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Wed, 2 Sep 2020 09:06:34 +0200
Subject: [PATCH 39/47] Revert some change from #2002

---
 CHANGES.md                                          |  1 -
 .../internal/session/room/send/MarkdownParser.kt    | 13 ++++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 86b796869e..9a41f3c4ef 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,7 +10,6 @@ Improvements 🙌:
 
 Bugfix 🐛:
  - Display name not shown under Settings/General (#1926)
- - Wrong markdown parsing (#350, #1375, #1939, #1982)
  - Words containing my name should not trigger notifications (#1781)
  - Fix changing language issue
  - Fix FontSize issue (#1483, #1787)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParser.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParser.kt
index 39ae35faa1..6ae3df187a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParser.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParser.kt
@@ -53,7 +53,7 @@ internal class MarkdownParser @Inject constructor(
             // According to https://matrix.org/docs/spec/client_server/latest#m-room-message-msgtypes:
             // The plain text version of the HTML should be provided in the body.
             // But it caused too many problems so it has been removed in #2002
-            TextContent(text, cleanHtmlText.trim())
+            TextContent(text, cleanHtmlText.postTreatment())
         } else {
             TextContent(text)
         }
@@ -61,4 +61,15 @@ internal class MarkdownParser @Inject constructor(
 
     private fun isFormattedTextPertinent(text: String, htmlText: String?) =
             text != htmlText && htmlText != "<p>${text.trim()}</p>\n"
+
+    /**
+     * The parser makes some mistakes, so deal with it here
+     */
+    private fun String.postTreatment(): String {
+        return this
+                // Remove extra space before and after the content
+                .trim()
+                // There is no need to include new line in an html-like source
+                .replace("\n", "")
+    }
 }

From e73480c0ef65c724e71d742052b708121d17be1d Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Thu, 3 Sep 2020 09:06:12 +0200
Subject: [PATCH 40/47] Riot -> Element

---
 .../sdk/internal/session/room/send/MarkdownParserTest.kt  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParserTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParserTest.kt
index 35d0bf6c86..2be535b16e 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParserTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParserTest.kt
@@ -30,9 +30,9 @@ import org.matrix.android.sdk.InstrumentedTest
  * It will not be possible to test all combinations. For the moment I add a few tests, then, depending on the problem discovered in the wild,
  * we can add more tests to cover the edge cases.
  * Some tests are suffixed with `_not_passing`, maybe one day we will fix them...
- * Riot-Web should be used as a reference for expected results, but not always. Especially Riot-Web add lots of `\n` in the
+ * Element Web should be used as a reference for expected results, but not always. Especially Element Web add lots of `\n` in the
  * formatted body, which is quite useless.
- * Also Riot-Web does not provide plain text body when formatted text is provided. The body contains what the user has entered.
+ * Also Element Web does not provide plain text body when formatted text is provided. The body contains what the user has entered.
  * See https://matrix.org/docs/spec/client_server/latest#m-room-message-msgtypes
  */
 @Suppress("SpellCheckingInspection")
@@ -92,12 +92,12 @@ class MarkdownParserTest : InstrumentedTest {
 
     @Test
     fun parseItalic2() {
-        // Riot-Web format
+        // Element Web format
         "_italic_".let { markdownParser.parse(it).expect(it, "<em>italic</em>") }
     }
 
     /**
-     * Note: the test is not passing, it does not work on Riot-Web neither
+     * Note: the test is not passing, it does not work on Element Web neither
      */
     @Test
     fun parseStrike_not_passing() {

From ae9afcc3932b4fd2dd859f1450538c224f6ae2d3 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Thu, 3 Sep 2020 09:16:37 +0200
Subject: [PATCH 41/47] Add test to cover line break

---
 CHANGES.md                                    |  1 +
 .../session/room/send/MarkdownParserTest.kt   | 82 ++++++++++++++++++-
 .../session/room/send/MarkdownParser.kt       |  1 +
 3 files changed, 80 insertions(+), 4 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 9a41f3c4ef..9d2a711e84 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,7 @@ Improvements 🙌:
 
 Bugfix 🐛:
  - Display name not shown under Settings/General (#1926)
+ - Editing message forgets line breaks and markdown (#1939)
  - Words containing my name should not trigger notifications (#1781)
  - Fix changing language issue
  - Fix FontSize issue (#1483, #1787)
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParserTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParserTest.kt
index 2be535b16e..3a25b92c2a 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParserTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParserTest.kt
@@ -30,9 +30,9 @@ import org.matrix.android.sdk.InstrumentedTest
  * It will not be possible to test all combinations. For the moment I add a few tests, then, depending on the problem discovered in the wild,
  * we can add more tests to cover the edge cases.
  * Some tests are suffixed with `_not_passing`, maybe one day we will fix them...
- * Element Web should be used as a reference for expected results, but not always. Especially Element Web add lots of `\n` in the
- * formatted body, which is quite useless.
- * Also Element Web does not provide plain text body when formatted text is provided. The body contains what the user has entered.
+ * Element Web should be used as a reference for expected results, but not always.
+ * Also Element Web does not provide plain text body when formatted text is provided. The body contains what the user has entered. We are doing
+ * the same to be able to edit messages (See #1939)
  * See https://matrix.org/docs/spec/client_server/latest#m-room-message-msgtypes
  */
 @Suppress("SpellCheckingInspection")
@@ -81,6 +81,15 @@ class MarkdownParserTest : InstrumentedTest {
         )
     }
 
+    @Test
+    fun parseBoldNewLines() {
+        testTypeNewLines(
+                name = "bold",
+                markdownPattern = "**",
+                htmlExpectedTag = "strong"
+        )
+    }
+
     @Test
     fun parseItalic() {
         testType(
@@ -90,6 +99,15 @@ class MarkdownParserTest : InstrumentedTest {
         )
     }
 
+    @Test
+    fun parseItalicNewLines() {
+        testTypeNewLines(
+                name = "italic",
+                markdownPattern = "*",
+                htmlExpectedTag = "em"
+        )
+    }
+
     @Test
     fun parseItalic2() {
         // Element Web format
@@ -108,6 +126,15 @@ class MarkdownParserTest : InstrumentedTest {
         )
     }
 
+    @Test
+    fun parseStrikeNewLines() {
+        testTypeNewLines(
+                name = "strike",
+                markdownPattern = "~~",
+                htmlExpectedTag = "del"
+        )
+    }
+
     @Test
     fun parseCode() {
         testType(
@@ -117,6 +144,15 @@ class MarkdownParserTest : InstrumentedTest {
         )
     }
 
+    @Test
+    fun parseCodeNewLines() {
+        testTypeNewLines(
+                name = "code",
+                markdownPattern = "`",
+                htmlExpectedTag = "code"
+        )
+    }
+
     @Test
     fun parseCode2() {
         testType(
@@ -126,6 +162,15 @@ class MarkdownParserTest : InstrumentedTest {
         )
     }
 
+    @Test
+    fun parseCode2NewLines() {
+        testTypeNewLines(
+                name = "code",
+                markdownPattern = "``",
+                htmlExpectedTag = "code"
+        )
+    }
+
     @Test
     fun parseCode3() {
         testType(
@@ -135,6 +180,15 @@ class MarkdownParserTest : InstrumentedTest {
         )
     }
 
+    @Test
+    fun parseCode3NewLines() {
+        testTypeNewLines(
+                name = "code",
+                markdownPattern = "```",
+                htmlExpectedTag = "code"
+        )
+    }
+
     @Test
     fun parseUnorderedList() {
         "- item1".let { markdownParser.parse(it).expect(it, "<ul><li>item1</li></ul>") }
@@ -164,7 +218,7 @@ class MarkdownParserTest : InstrumentedTest {
 
     @Test
     fun parseQuote_not_passing() {
-        "> quoted\nline2".let { markdownParser.parse(it).expect(it, "<blockquote><p>quoted<br/>line2</p></blockquote>") }
+        "> quoted\nline2".let { markdownParser.parse(it).expect(it, "<blockquote><p>quoted<br />line2</p></blockquote>") }
     }
 
     @Test
@@ -278,6 +332,26 @@ class MarkdownParserTest : InstrumentedTest {
                 }
     }
 
+    private fun testTypeNewLines(name: String,
+                                 markdownPattern: String,
+                                 htmlExpectedTag: String) {
+        // With new line inside the block
+        "$markdownPattern$name\n$name$markdownPattern"
+                .let {
+                    markdownParser.parse(it)
+                            .expect(expectedText = it,
+                                    expectedFormattedText = "<$htmlExpectedTag>$name<br />$name</$htmlExpectedTag>")
+                }
+
+        // With new line between two blocks
+        "$markdownPattern$name$markdownPattern\n$markdownPattern$name$markdownPattern"
+                .let {
+                    markdownParser.parse(it)
+                            .expect(expectedText = it,
+                                    expectedFormattedText = "<$htmlExpectedTag>$name</$htmlExpectedTag><$htmlExpectedTag>$name</$htmlExpectedTag>")
+                }
+    }
+
     private fun TextContent.expect(expectedText: String, expectedFormattedText: String?) {
         assertEquals("TextContent are not identical", TextContent(expectedText, expectedFormattedText), this)
     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParser.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParser.kt
index 6ae3df187a..b493897d8a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParser.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParser.kt
@@ -70,6 +70,7 @@ internal class MarkdownParser @Inject constructor(
                 // Remove extra space before and after the content
                 .trim()
                 // There is no need to include new line in an html-like source
+                // But new line can be in embedded code block, so do not remove them
                 .replace("\n", "")
     }
 }

From be3157b6f55649a720569f4f70aa0c516138aac4 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 3 Sep 2020 09:23:18 +0200
Subject: [PATCH 42/47] Do not strip new lines. Many tests are not passing, we
 should work more on it...

---
 .../session/room/send/MarkdownParserTest.kt      | 16 ++++++++--------
 .../internal/session/room/send/MarkdownParser.kt |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParserTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParserTest.kt
index 3a25b92c2a..eebaa93415 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParserTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParserTest.kt
@@ -191,14 +191,14 @@ class MarkdownParserTest : InstrumentedTest {
 
     @Test
     fun parseUnorderedList() {
-        "- item1".let { markdownParser.parse(it).expect(it, "<ul><li>item1</li></ul>") }
-        "- item1\n- item2".let { markdownParser.parse(it).expect(it, "<ul><li>item1</li><li>item2</li></ul>") }
+        "- item1".let { markdownParser.parse(it).expect(it, "<ul>\n<li>item1</li>\n</ul>") }
+        "- item1\n- item2".let { markdownParser.parse(it).expect(it, "<ul>\n<li>item1</li>\n<li>item2</li>\n</ul>") }
     }
 
     @Test
     fun parseOrderedList() {
-        "1. item1".let { markdownParser.parse(it).expect(it, "<ol><li>item1</li></ol>") }
-        "1. item1\n2. item2".let { markdownParser.parse(it).expect(it, "<ol><li>item1</li><li>item2</li></ol>") }
+        "1. item1".let { markdownParser.parse(it).expect(it, "<ol>\n<li>item1</li>\n</ol>") }
+        "1. item1\n2. item2".let { markdownParser.parse(it).expect(it, "<ol>\n<li>item1</li>\n<li>item2</li>\n</ol>") }
     }
 
     @Test
@@ -208,12 +208,12 @@ class MarkdownParserTest : InstrumentedTest {
 
     @Test
     fun parseH2AndContent() {
-        "a\n---\nb".let { markdownParser.parse(it).expect(it, "<h2>a</h2><p>b</p>") }
+        "a\n---\nb".let { markdownParser.parse(it).expect(it, "<h2>a</h2>\n<p>b</p>") }
     }
 
     @Test
     fun parseQuote() {
-        "> quoted".let { markdownParser.parse(it).expect(it, "<blockquote><p>quoted</p></blockquote>") }
+        "> quoted".let { markdownParser.parse(it).expect(it, "<blockquote>\n<p>quoted</p>\n</blockquote>") }
     }
 
     @Test
@@ -239,7 +239,7 @@ class MarkdownParserTest : InstrumentedTest {
 
     @Test
     fun parseHeads() {
-        "# head1\n# head2".let { markdownParser.parse(it).expect(it, "<h1>head1</h1><h1>head2</h1>") }
+        "# head1\n# head2".let { markdownParser.parse(it).expect(it, "<h1>head1</h1>\n<h1>head2</h1>") }
     }
 
     @Test
@@ -254,7 +254,7 @@ class MarkdownParserTest : InstrumentedTest {
 
     @Test
     fun parseParagraph() {
-        "# head\ncontent".let { markdownParser.parse(it).expect(it, "<h1>head</h1><p>content</p>") }
+        "# head\ncontent".let { markdownParser.parse(it).expect(it, "<h1>head</h1>\n<p>content</p>") }
     }
 
     private fun testIdentity(text: String) {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParser.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParser.kt
index b493897d8a..f80285574e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParser.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParser.kt
@@ -71,6 +71,6 @@ internal class MarkdownParser @Inject constructor(
                 .trim()
                 // There is no need to include new line in an html-like source
                 // But new line can be in embedded code block, so do not remove them
-                .replace("\n", "")
+                // .replace("\n", "")
     }
 }

From b935a6557f000264ca19e5fc90abe6fc804bdf34 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 12 Aug 2020 12:20:11 +0200
Subject: [PATCH 43/47] Move state to a dedicated file

---
 ...iceVerificationInfoBottomSheetViewModel.kt | 16 ++--------
 ...iceVerificationInfoBottomSheetViewState.kt | 31 +++++++++++++++++++
 2 files changed, 33 insertions(+), 14 deletions(-)
 create mode 100644 vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetViewState.kt

diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetViewModel.kt
index 6f5bd909c7..5746891576 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetViewModel.kt
@@ -15,31 +15,19 @@
  */
 package im.vector.app.features.settings.devices
 
-import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.FragmentViewModelContext
 import com.airbnb.mvrx.Loading
-import com.airbnb.mvrx.MvRxState
 import com.airbnb.mvrx.MvRxViewModelFactory
-import com.airbnb.mvrx.Uninitialized
 import com.airbnb.mvrx.ViewModelContext
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
-import org.matrix.android.sdk.api.session.Session
-import org.matrix.android.sdk.internal.crypto.model.CryptoDeviceInfo
-import org.matrix.android.sdk.internal.crypto.model.rest.DeviceInfo
 import im.vector.app.core.platform.EmptyAction
 import im.vector.app.core.platform.EmptyViewEvents
 import im.vector.app.core.platform.VectorViewModel
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.internal.crypto.model.rest.DeviceInfo
 import org.matrix.android.sdk.rx.rx
 
-data class DeviceVerificationInfoBottomSheetViewState(
-        val cryptoDeviceInfo: Async<CryptoDeviceInfo?> = Uninitialized,
-        val deviceInfo: Async<DeviceInfo> = Uninitialized,
-        val hasAccountCrossSigning: Boolean = false,
-        val accountCrossSigningIsTrusted: Boolean = false,
-        val isMine: Boolean = false
-) : MvRxState
-
 class DeviceVerificationInfoBottomSheetViewModel @AssistedInject constructor(@Assisted initialState: DeviceVerificationInfoBottomSheetViewState,
                                                                              @Assisted val deviceId: String,
                                                                              val session: Session
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetViewState.kt b/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetViewState.kt
new file mode 100644
index 0000000000..41a33ccfdd
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetViewState.kt
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.settings.devices
+
+import com.airbnb.mvrx.Async
+import com.airbnb.mvrx.MvRxState
+import com.airbnb.mvrx.Uninitialized
+import im.vector.matrix.android.internal.crypto.model.CryptoDeviceInfo
+import im.vector.matrix.android.internal.crypto.model.rest.DeviceInfo
+
+data class DeviceVerificationInfoBottomSheetViewState(
+        val cryptoDeviceInfo: Async<CryptoDeviceInfo?> = Uninitialized,
+        val deviceInfo: Async<DeviceInfo> = Uninitialized,
+        val hasAccountCrossSigning: Boolean = false,
+        val accountCrossSigningIsTrusted: Boolean = false,
+        val isMine: Boolean = false
+) : MvRxState

From 6af879fe2a5732522b1f7467174689cd91ac18af Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 12 Aug 2020 12:21:50 +0200
Subject: [PATCH 44/47] Rename class

---
 .../devices/DeviceVerificationInfoBottomSheet.kt       | 10 +++++-----
 ... => DeviceVerificationInfoBottomSheetController.kt} |  6 +++---
 .../DeviceVerificationInfoBottomSheetViewState.kt      |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)
 rename vector/src/main/java/im/vector/app/features/settings/devices/{DeviceVerificationInfoEpoxyController.kt => DeviceVerificationInfoBottomSheetController.kt} (98%)

diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheet.kt b/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheet.kt
index 6a334898c0..c8b12e26a5 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheet.kt
@@ -39,7 +39,7 @@ data class DeviceVerificationInfoArgs(
         val deviceId: String
 ) : Parcelable
 
-class DeviceVerificationInfoBottomSheet : VectorBaseBottomSheetDialogFragment(), DeviceVerificationInfoEpoxyController.Callback {
+class DeviceVerificationInfoBottomSheet : VectorBaseBottomSheetDialogFragment(), DeviceVerificationInfoBottomSheetController.Callback {
 
     private val viewModel: DeviceVerificationInfoBottomSheetViewModel by fragmentViewModel(DeviceVerificationInfoBottomSheetViewModel::class)
 
@@ -54,17 +54,17 @@ class DeviceVerificationInfoBottomSheet : VectorBaseBottomSheetDialogFragment(),
         injector.inject(this)
     }
 
-    @Inject lateinit var epoxyController: DeviceVerificationInfoEpoxyController
+    @Inject lateinit var controller: DeviceVerificationInfoBottomSheetController
 
     override fun getLayoutResId() = R.layout.bottom_sheet_generic_list_with_title
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
         recyclerView.configureWith(
-                epoxyController,
+                controller,
                 showDivider = false,
                 hasFixedSize = false)
-        epoxyController.callback = this
+        controller.callback = this
         bottomSheetTitle.isVisible = false
     }
 
@@ -74,7 +74,7 @@ class DeviceVerificationInfoBottomSheet : VectorBaseBottomSheetDialogFragment(),
     }
 
     override fun invalidate() = withState(viewModel) {
-        epoxyController.setData(it)
+        controller.setData(it)
         super.invalidate()
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoEpoxyController.kt b/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetController.kt
similarity index 98%
rename from vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoEpoxyController.kt
rename to vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetController.kt
index bae31124ed..393bc741fe 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoEpoxyController.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetController.kt
@@ -31,9 +31,9 @@ import im.vector.app.features.crypto.verification.epoxy.bottomSheetVerificationA
 import timber.log.Timber
 import javax.inject.Inject
 
-class DeviceVerificationInfoEpoxyController @Inject constructor(private val stringProvider: StringProvider,
-                                                                private val colorProvider: ColorProvider,
-                                                                private val session: Session)
+class DeviceVerificationInfoBottomSheetController @Inject constructor(private val stringProvider: StringProvider,
+                                                                      private val colorProvider: ColorProvider,
+                                                                      private val session: Session)
     : TypedEpoxyController<DeviceVerificationInfoBottomSheetViewState>() {
 
     var callback: Callback? = null
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetViewState.kt b/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetViewState.kt
index 41a33ccfdd..ff7532fdaf 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetViewState.kt
@@ -19,8 +19,8 @@ package im.vector.app.features.settings.devices
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.MvRxState
 import com.airbnb.mvrx.Uninitialized
-import im.vector.matrix.android.internal.crypto.model.CryptoDeviceInfo
-import im.vector.matrix.android.internal.crypto.model.rest.DeviceInfo
+import org.matrix.android.sdk.internal.crypto.model.CryptoDeviceInfo
+import org.matrix.android.sdk.internal.crypto.model.rest.DeviceInfo
 
 data class DeviceVerificationInfoBottomSheetViewState(
         val cryptoDeviceInfo: Async<CryptoDeviceInfo?> = Uninitialized,

From 96c7f57ea0fb543f0852b9f0256184c58df91868 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 12 Aug 2020 12:22:54 +0200
Subject: [PATCH 45/47] Remove useless member

---
 .../DeviceVerificationInfoBottomSheetController.kt    | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetController.kt b/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetController.kt
index 393bc741fe..5fb6e20a2f 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetController.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetController.kt
@@ -16,9 +16,6 @@
 package im.vector.app.features.settings.devices
 
 import com.airbnb.epoxy.TypedEpoxyController
-import org.matrix.android.sdk.api.extensions.orFalse
-import org.matrix.android.sdk.api.session.Session
-import org.matrix.android.sdk.internal.crypto.model.CryptoDeviceInfo
 import im.vector.app.R
 import im.vector.app.core.epoxy.dividerItem
 import im.vector.app.core.epoxy.loadingItem
@@ -28,12 +25,14 @@ import im.vector.app.core.ui.list.GenericItem
 import im.vector.app.core.ui.list.genericFooterItem
 import im.vector.app.core.ui.list.genericItem
 import im.vector.app.features.crypto.verification.epoxy.bottomSheetVerificationActionItem
+import org.matrix.android.sdk.api.extensions.orFalse
+import org.matrix.android.sdk.internal.crypto.model.CryptoDeviceInfo
 import timber.log.Timber
 import javax.inject.Inject
 
-class DeviceVerificationInfoBottomSheetController @Inject constructor(private val stringProvider: StringProvider,
-                                                                      private val colorProvider: ColorProvider,
-                                                                      private val session: Session)
+class DeviceVerificationInfoBottomSheetController @Inject constructor(
+        private val stringProvider: StringProvider,
+        private val colorProvider: ColorProvider)
     : TypedEpoxyController<DeviceVerificationInfoBottomSheetViewState>() {
 
     var callback: Callback? = null

From 2efe5a420cf377041afc51b47134abeacc7ed71b Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 12 Aug 2020 12:53:57 +0200
Subject: [PATCH 46/47] Do not propose to verify the current session if there
 is only one session (#1901)

---
 CHANGES.md                                      |  1 +
 ...viceVerificationInfoBottomSheetController.kt | 17 ++++++++++-------
 ...eviceVerificationInfoBottomSheetViewModel.kt |  8 ++++++++
 ...eviceVerificationInfoBottomSheetViewState.kt |  3 ++-
 4 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 86b796869e..1ec6d091a9 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -7,6 +7,7 @@ Features ✨:
 Improvements 🙌:
  - You can now join room through permalink and within room directory search
  - Add long click gesture to copy userId, user display name, room name, room topic and room alias (#1774)
+ - Do not propose to verify session if there is only one session (#1901)
 
 Bugfix 🐛:
  - Display name not shown under Settings/General (#1926)
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetController.kt b/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetController.kt
index 5fb6e20a2f..9c7615c94b 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetController.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetController.kt
@@ -66,16 +66,18 @@ class DeviceVerificationInfoBottomSheetController @Inject constructor(
 
         if (data.hasAccountCrossSigning) {
             // Cross Signing is enabled
-            handleE2EWithCrossSigning(data.isMine, data.accountCrossSigningIsTrusted, cryptoDeviceInfo, shield)
+            handleE2EWithCrossSigning(data, cryptoDeviceInfo, shield)
         } else {
-            handleE2EInLegacy(data.isMine, cryptoDeviceInfo, shield)
+            handleE2EInLegacy(data, cryptoDeviceInfo, shield)
         }
 
         // COMMON ACTIONS (Rename / signout)
         addGenericDeviceManageActions(data, cryptoDeviceInfo.deviceId)
     }
 
-    private fun handleE2EWithCrossSigning(isMine: Boolean, currentSessionIsTrusted: Boolean, cryptoDeviceInfo: CryptoDeviceInfo, shield: Int) {
+    private fun handleE2EWithCrossSigning(data: DeviceVerificationInfoBottomSheetViewState, cryptoDeviceInfo: CryptoDeviceInfo, shield: Int) {
+        val isMine = data.isMine
+        val currentSessionIsTrusted = data.accountCrossSigningIsTrusted
         Timber.v("handleE2EWithCrossSigning $isMine, $cryptoDeviceInfo, $shield")
 
         if (isMine) {
@@ -87,8 +89,8 @@ class DeviceVerificationInfoBottomSheetController @Inject constructor(
                     title(stringProvider.getString(R.string.encryption_information_verified))
                     description(stringProvider.getString(R.string.settings_active_sessions_verified_device_desc))
                 }
-            } else {
-                // You need to complete security
+            } else if (data.hasOtherSessions) {
+                // You need to complete security, only if there are other session(s) available
                 genericItem {
                     id("trust${cryptoDeviceInfo.deviceId}")
                     style(GenericItem.STYLE.BIG_TEXT)
@@ -131,7 +133,7 @@ class DeviceVerificationInfoBottomSheetController @Inject constructor(
             description("(${cryptoDeviceInfo.deviceId})")
         }
 
-        if (isMine && !currentSessionIsTrusted) {
+        if (isMine && !currentSessionIsTrusted && data.hasOtherSessions) {
             // Add complete security
             dividerItem {
                 id("completeSecurityDiv")
@@ -157,8 +159,9 @@ class DeviceVerificationInfoBottomSheetController @Inject constructor(
         }
     }
 
-    private fun handleE2EInLegacy(isMine: Boolean, cryptoDeviceInfo: CryptoDeviceInfo, shield: Int) {
+    private fun handleE2EInLegacy(data: DeviceVerificationInfoBottomSheetViewState, cryptoDeviceInfo: CryptoDeviceInfo, shield: Int) {
         // ==== Legacy
+        val isMine = data.isMine
 
         // TRUST INFO SECTION
         if (cryptoDeviceInfo.trustLevel?.isLocallyVerified() == true) {
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetViewModel.kt
index 5746891576..34e3c566fb 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetViewModel.kt
@@ -65,6 +65,14 @@ class DeviceVerificationInfoBottomSheetViewModel @AssistedInject constructor(@As
                     )
                 }
 
+        session.rx().liveUserCryptoDevices(session.myUserId)
+                .map { it.size }
+                .execute {
+                    copy(
+                            hasOtherSessions = it.invoke() ?: 0 > 1
+                    )
+                }
+
         setState {
             copy(deviceInfo = Loading())
         }
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetViewState.kt b/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetViewState.kt
index ff7532fdaf..61e4aa6f4d 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetViewState.kt
@@ -27,5 +27,6 @@ data class DeviceVerificationInfoBottomSheetViewState(
         val deviceInfo: Async<DeviceInfo> = Uninitialized,
         val hasAccountCrossSigning: Boolean = false,
         val accountCrossSigningIsTrusted: Boolean = false,
-        val isMine: Boolean = false
+        val isMine: Boolean = false,
+        val hasOtherSessions: Boolean = false
 ) : MvRxState

From 633b12f66d69869d911683aff12886303222a97c Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 3 Sep 2020 10:00:01 +0200
Subject: [PATCH 47/47] Propose to verify the current session if the 4S
 contains secret, even if there is no other sessions

---
 CHANGES.md                                           |  2 +-
 .../DeviceVerificationInfoBottomSheetController.kt   | 12 ++++++++----
 .../DeviceVerificationInfoBottomSheetViewModel.kt    |  3 ++-
 .../DeviceVerificationInfoBottomSheetViewState.kt    |  9 +++++++--
 vector/src/main/res/values/strings.xml               |  1 +
 5 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 1ec6d091a9..e0031644a6 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -7,7 +7,7 @@ Features ✨:
 Improvements 🙌:
  - You can now join room through permalink and within room directory search
  - Add long click gesture to copy userId, user display name, room name, room topic and room alias (#1774)
- - Do not propose to verify session if there is only one session (#1901)
+ - Do not propose to verify session if there is only one session and 4S is not configured (#1901)
 
 Bugfix 🐛:
  - Display name not shown under Settings/General (#1926)
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetController.kt b/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetController.kt
index 9c7615c94b..25a98bb4b5 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetController.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetController.kt
@@ -89,14 +89,18 @@ class DeviceVerificationInfoBottomSheetController @Inject constructor(
                     title(stringProvider.getString(R.string.encryption_information_verified))
                     description(stringProvider.getString(R.string.settings_active_sessions_verified_device_desc))
                 }
-            } else if (data.hasOtherSessions) {
-                // You need to complete security, only if there are other session(s) available
+            } else if (data.canVerifySession) {
+                // You need to complete security, only if there are other session(s) available, or if 4S contains secrets
                 genericItem {
                     id("trust${cryptoDeviceInfo.deviceId}")
                     style(GenericItem.STYLE.BIG_TEXT)
                     titleIconResourceId(shield)
                     title(stringProvider.getString(R.string.crosssigning_verify_this_session))
-                    description(stringProvider.getString(R.string.confirm_your_identity))
+                    if (data.hasOtherSessions) {
+                        description(stringProvider.getString(R.string.confirm_your_identity))
+                    } else {
+                        description(stringProvider.getString(R.string.confirm_your_identity_quad_s))
+                    }
                 }
             }
         } else {
@@ -133,7 +137,7 @@ class DeviceVerificationInfoBottomSheetController @Inject constructor(
             description("(${cryptoDeviceInfo.deviceId})")
         }
 
-        if (isMine && !currentSessionIsTrusted && data.hasOtherSessions) {
+        if (isMine && !currentSessionIsTrusted && data.canVerifySession) {
             // Add complete security
             dividerItem {
                 id("completeSecurityDiv")
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetViewModel.kt
index 34e3c566fb..ad840d2efb 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetViewModel.kt
@@ -43,7 +43,8 @@ class DeviceVerificationInfoBottomSheetViewModel @AssistedInject constructor(@As
         setState {
             copy(
                     hasAccountCrossSigning = session.cryptoService().crossSigningService().isCrossSigningInitialized(),
-                    accountCrossSigningIsTrusted = session.cryptoService().crossSigningService().isCrossSigningVerified()
+                    accountCrossSigningIsTrusted = session.cryptoService().crossSigningService().isCrossSigningVerified(),
+                    isRecoverySetup = session.sharedSecretStorageService.isRecoverySetup()
             )
         }
         session.rx().liveCrossSigningInfo(session.myUserId)
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetViewState.kt b/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetViewState.kt
index 61e4aa6f4d..a736b0442c 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetViewState.kt
@@ -28,5 +28,10 @@ data class DeviceVerificationInfoBottomSheetViewState(
         val hasAccountCrossSigning: Boolean = false,
         val accountCrossSigningIsTrusted: Boolean = false,
         val isMine: Boolean = false,
-        val hasOtherSessions: Boolean = false
-) : MvRxState
+        val hasOtherSessions: Boolean = false,
+        val isRecoverySetup: Boolean = false
+) : MvRxState {
+
+    val canVerifySession: Boolean
+        get() = hasOtherSessions || isRecoverySetup
+}
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 7506a4d502..2e031cfd4f 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -2413,6 +2413,7 @@
     <string name="crosssigning_verify_session">Verify login</string>
     <string name="cross_signing_verify_by_emoji">Interactively Verify by Emoji</string>
     <string name="confirm_your_identity">Confirm your identity by verifying this login from one of your other sessions, granting it access to encrypted messages.</string>
+    <string name="confirm_your_identity_quad_s">Confirm your identity by verifying this login, granting it access to encrypted messages.</string>
     <string name="mark_as_verified">Mark as Trusted</string>
 
     <string name="error_empty_field_choose_user_name">Please choose a username.</string>