From e658ef184d104d97613c5e8ab596530aba3d3141 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Tue, 30 Jun 2020 16:18:56 +0200
Subject: [PATCH] Fix issue with save action visibility

---
 .../features/roomprofile/settings/RoomSettingsViewModel.kt    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vector/src/main/java/im/vector/riotx/features/roomprofile/settings/RoomSettingsViewModel.kt b/vector/src/main/java/im/vector/riotx/features/roomprofile/settings/RoomSettingsViewModel.kt
index 4e406e0093..e198375cfb 100644
--- a/vector/src/main/java/im/vector/riotx/features/roomprofile/settings/RoomSettingsViewModel.kt
+++ b/vector/src/main/java/im/vector/riotx/features/roomprofile/settings/RoomSettingsViewModel.kt
@@ -65,7 +65,7 @@ class RoomSettingsViewModel @AssistedInject constructor(@Assisted initialState:
                 RoomSettingsViewState::newTopic,
                 RoomSettingsViewState::newHistoryVisibility,
                 RoomSettingsViewState::roomSummary) { newName,
-                                                      newAlias,
+                                                      newCanonicalAlias,
                                                       newTopic,
                                                       newHistoryVisibility,
                                                       asyncSummary ->
@@ -74,7 +74,7 @@ class RoomSettingsViewModel @AssistedInject constructor(@Assisted initialState:
                 copy(
                         showSaveAction = summary?.name != newName
                                 || summary?.topic != newTopic
-                                || summary?.canonicalAlias != newAlias
+                                || summary?.canonicalAlias != newCanonicalAlias?.takeIf { it.isNotEmpty() }
                                 || newHistoryVisibility != null
                 )
             }