added notifications and encryption for the new roomsettings

2 files changed, 9 insertions, 3 deletions

diff --git a/src/timeline/TimelineViewManager.cpp b/src/timeline/TimelineViewManager.cpp

index 7c1922d7..4edc3369 100644
--- a/src/timeline/TimelineViewManager.cpp
+++ b/src/timeline/TimelineViewManager.cpp
@@ -126,6 +126,12 @@ TimelineViewManager::TimelineViewManager(CallManager *callManager, ChatPage *par
           0,
           "UserProfileModel",
           "UserProfile needs to be instantiated on the C++ side");
+        qmlRegisterUncreatableType<RoomSettings>(
+          "im.nheko",
+          1,
+          0,
+          "RoomSettingsModel",
+          "Room Settings needs to be instantiated on the C++ side");
 
         static auto self = this;
         qmlRegisterSingletonType<MainWindow>(
@@ -394,8 +400,8 @@ TimelineViewManager::openRoomSettings()
 {
         MainWindow::instance()->openRoomSettings(timeline_->roomId());
 
-        RoomSettings *roomSettings = new RoomSettings(timeline_->roomId(), this);
-        emit openRoomSettingsDialog(roomSettings);
+        RoomSettings *settings = new RoomSettings(timeline_->roomId(), this);
+        emit openRoomSettingsDialog(settings);
 }
 
 void
diff --git a/src/timeline/TimelineViewManager.h b/src/timeline/TimelineViewManager.h

index dca133ce..10708033 100644
--- a/src/timeline/TimelineViewManager.h
+++ b/src/timeline/TimelineViewManager.h
@@ -89,7 +89,7 @@ signals:
         void showRoomList();
         void narrowViewChanged();
         void focusChanged();
-        void openRoomSettingsDialog(RoomSettings *roomSettings);
+        void openRoomSettingsDialog(RoomSettings *settings);
 
 public slots:
         void updateReadReceipts(const QString &room_id, const std::vector<QString> &event_ids);