From 893ebd969059c5198d4ade3a30d12267d761263e Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 23 Nov 2020 17:54:14 +0100
Subject: [PATCH] Fix UI error

---
 .../roomprofile/alias/RoomAliasController.kt  | 43 +++++++++++--------
 1 file changed, 24 insertions(+), 19 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/alias/RoomAliasController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/alias/RoomAliasController.kt
index 2737c92fed..f51cd610c2 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/alias/RoomAliasController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/alias/RoomAliasController.kt
@@ -60,6 +60,13 @@ class RoomAliasController @Inject constructor(
     override fun buildModels(data: RoomAliasViewState?) {
         data ?: return
 
+        // Published
+        buildPublishInfo(data)
+        // Local
+        buildLocalInfo(data)
+    }
+
+    private fun buildPublishInfo(data: RoomAliasViewState) {
         buildProfileSection(
                 stringProvider.getString(R.string.room_alias_published_alias_title)
         )
@@ -68,11 +75,8 @@ class RoomAliasController @Inject constructor(
             helperTextResId(R.string.room_alias_published_alias_subtitle)
         }
 
-        // TODO Canonical
-        settingsInfoItem {
-            id("otherPublished")
-            helperTextResId(R.string.room_alias_published_other)
-        }
+        // TODO Set/Unset Canonical
+
         if (data.alternativeAliases.isEmpty()) {
             settingsInfoItem {
                 id("otherPublishedEmpty")
@@ -82,6 +86,21 @@ class RoomAliasController @Inject constructor(
                     helperTextResId(R.string.room_alias_address_empty)
                 }
             }
+        } else {
+            settingsInfoItem {
+                id("otherPublished")
+                helperTextResId(R.string.room_alias_published_other)
+            }
+            data.alternativeAliases.forEachIndexed { idx, altAlias ->
+                // TODO Rename this item to a more generic name
+                threePidItem {
+                    id("alt_$idx")
+                    title(altAlias)
+                    if (data.actionPermissions.canChangeCanonicalAlias) {
+                        deleteClickListener { callback?.removeAlias(altAlias) }
+                    }
+                }
+            }
         }
 
         if (data.actionPermissions.canChangeCanonicalAlias) {
@@ -100,20 +119,6 @@ class RoomAliasController @Inject constructor(
                 buttonClickListener { callback?.addAlias() }
             }
         }
-
-        data.alternativeAliases.forEachIndexed { idx, altAlias ->
-            // TODO Rename this item to a more generic name
-            threePidItem {
-                id("alt_$idx")
-                title(altAlias)
-                if (data.actionPermissions.canChangeCanonicalAlias) {
-                    deleteClickListener { callback?.removeAlias(altAlias) }
-                }
-            }
-        }
-
-        // Local
-        buildLocalInfo(data)
     }
 
     private fun buildLocalInfo(data: RoomAliasViewState) {