From c16892fa25eb48aa722abaccdec4f14e8dd5a7b0 Mon Sep 17 00:00:00 2001
From: Black Hat <bhat@encom.eu.org>
Date: Thu, 4 Jul 2019 15:58:45 +0800
Subject: [PATCH] Changing canonical alias and displaying local aliases are
 working.

---
 imports/Spectral/Dialog/RoomSettingsDialog.qml | 16 ++++++++++++----
 include/libQuotient                            |  2 +-
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/imports/Spectral/Dialog/RoomSettingsDialog.qml b/imports/Spectral/Dialog/RoomSettingsDialog.qml
index 0003a71de..d76587a66 100644
--- a/imports/Spectral/Dialog/RoomSettingsDialog.qml
+++ b/imports/Spectral/Dialog/RoomSettingsDialog.qml
@@ -197,9 +197,11 @@ Dialog {
                 ComboBox {
                     Layout.fillWidth: true
 
-                    model: room.aliases
+                    id: canonicalAliasComboBox
 
-                    currentIndex: room.aliases.indexOf(room.canonicalAlias)
+                    model: room.remoteAliases
+
+                    currentIndex: room.remoteAliases.indexOf(room.canonicalAlias)
                 }
             }
 
@@ -211,15 +213,17 @@ Dialog {
                     Layout.alignment: Qt.AlignTop
 
                     wrapMode: Label.Wrap
-                    text: "Aliases"
+                    text: "Local Aliases"
                     color: MPalette.lighter
                 }
 
                 ColumnLayout {
                     Layout.fillWidth: true
 
+                    spacing: 0
+
                     Repeater {
-                        model: room.aliases
+                        model: room.localAliases
 
                         delegate: Label {
                             Layout.fillWidth: true
@@ -295,6 +299,10 @@ Dialog {
         if (room.topic != roomTopicField.text) {
             room.setTopic(roomTopicField.text)
         }
+
+        if (room.canonicalAlias != room.remoteAliases[canonicalAliasComboBox.currentIndex]) {
+            room.setCanonicalAlias(room.remoteAliases[canonicalAliasComboBox.currentIndex])
+        }
     }
 }
 
diff --git a/include/libQuotient b/include/libQuotient
index d3ddd394e..fe8253386 160000
--- a/include/libQuotient
+++ b/include/libQuotient
@@ -1 +1 @@
-Subproject commit d3ddd394e855cfe217bf0f0d368822c9b99316bb
+Subproject commit fe82533860a327fbbaa0c980188ccd56d8463b1c