From 8f6f72ca487e6f430b3e33a9edcd8bc6079d4e8f Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 14 Jun 2019 16:06:07 +0200
Subject: [PATCH] Review: Added optional to stage and renamed to
 "InteractiveAuthenticationFlow"

---
 .../data/{LoginFlow.kt => InteractiveAuthenticationFlow.kt} | 6 +++---
 .../matrix/android/internal/auth/data/LoginFlowResponse.kt  | 6 +++++-
 .../internal/auth/registration/RegistrationFlowResponse.kt  | 6 +++---
 .../android/internal/crypto/tasks/DeleteDeviceTask.kt       | 6 +++---
 4 files changed, 14 insertions(+), 10 deletions(-)
 rename matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/{LoginFlow.kt => InteractiveAuthenticationFlow.kt} (86%)

diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/LoginFlow.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/InteractiveAuthenticationFlow.kt
similarity index 86%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/LoginFlow.kt
rename to matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/InteractiveAuthenticationFlow.kt
index a0b56d7a..c5d8dcc5 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/LoginFlow.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/InteractiveAuthenticationFlow.kt
@@ -20,14 +20,14 @@ import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 
 /**
- * A Login flow.
+ * An interactive authentication flow.
  */
 @JsonClass(generateAdapter = true)
-internal data class LoginFlow(
+internal data class InteractiveAuthenticationFlow(
 
         @Json(name = "type")
         val type: String? = null,
 
         @Json(name = "stages")
-        val stages: List<String>
+        val stages: List<String>? = null
 )
\ No newline at end of file
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/LoginFlowResponse.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/LoginFlowResponse.kt
index a5062181..834b0aee 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/LoginFlowResponse.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/LoginFlowResponse.kt
@@ -16,7 +16,11 @@
 
 package im.vector.matrix.android.internal.auth.data
 
+import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 
 @JsonClass(generateAdapter = true)
-internal data class LoginFlowResponse(val flows: List<LoginFlow>)
\ No newline at end of file
+internal data class LoginFlowResponse(
+        @Json(name = "flows")
+        val flows: List<InteractiveAuthenticationFlow>
+)
\ No newline at end of file
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/registration/RegistrationFlowResponse.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/registration/RegistrationFlowResponse.kt
index ac23fe15..747db64c 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/registration/RegistrationFlowResponse.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/registration/RegistrationFlowResponse.kt
@@ -19,16 +19,16 @@ package im.vector.matrix.android.internal.auth.registration
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 import im.vector.matrix.android.api.util.JsonDict
-import im.vector.matrix.android.internal.auth.data.LoginFlow
+import im.vector.matrix.android.internal.auth.data.InteractiveAuthenticationFlow
 
 @JsonClass(generateAdapter = true)
 internal data class RegistrationFlowResponse(
 
         /**
-         * The list of stages the client has completed successfully.
+         * The list of flows.
          */
         @Json(name = "flows")
-        var loginFlows: List<LoginFlow>? = null,
+        var flows: List<InteractiveAuthenticationFlow>? = null,
 
         /**
          * The list of stages the client has completed successfully.
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/DeleteDeviceTask.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/DeleteDeviceTask.kt
index bbd2d440..2b7649fd 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/DeleteDeviceTask.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/DeleteDeviceTask.kt
@@ -58,12 +58,12 @@ internal class DefaultDeleteDeviceTask(private val cryptoApi: CryptoApi,
                 }
 
                 // check if the server response can be casted
-                if (registrationFlowResponse?.loginFlows?.isNotEmpty() == true) {
+                if (registrationFlowResponse?.flows?.isNotEmpty() == true) {
                     val stages = ArrayList<String>()
 
                     // Get all stages
-                    registrationFlowResponse.loginFlows?.forEach {
-                        stages.addAll(it.stages)
+                    registrationFlowResponse.flows?.forEach {
+                        stages.addAll(it.stages ?: emptyList())
                     }
 
                     Timber.v("## deleteDevice() : supported stages $stages")