Skip to content
Snippets Groups Projects
Commit f27f4374 authored by Albert  Babí Oller's avatar Albert Babí Oller Committed by Andreas Traczyk
Browse files

smartlist: switch to conversations tab on invitation accept

- switch tab to conversations smartlist
- go to welcomeview

TODO: define UI behavior while waiting for the smartlist update

Gitlab: #284

Change-Id: I251c49e5b0b418f41d5872ef09d32db5bc940df2
parent 5f6eb215
No related branches found
No related tags found
No related merge requests found
...@@ -463,6 +463,11 @@ Rectangle { ...@@ -463,6 +463,11 @@ Rectangle {
function onNavigateToWelcomePageRequested() { function onNavigateToWelcomePageRequested() {
backToMainView() backToMainView()
} }
function onInvitationAccepted() {
mainViewSidePanel.selectTab(SidePanelTabBar.Conversations)
showWelcomeView()
}
} }
Component.onCompleted: { Component.onCompleted: {
......
...@@ -664,6 +664,9 @@ MessagesAdapter::acceptInvitation(const QString& convUid) ...@@ -664,6 +664,9 @@ MessagesAdapter::acceptInvitation(const QString& convUid)
{ {
const auto currentConvUid = convUid.isEmpty() ? lrcInstance_->getCurrentConvUid() : convUid; const auto currentConvUid = convUid.isEmpty() ? lrcInstance_->getCurrentConvUid() : convUid;
lrcInstance_->getCurrentConversationModel()->makePermanent(currentConvUid); lrcInstance_->getCurrentConversationModel()->makePermanent(currentConvUid);
if (convUid == currentConvUid_)
currentConvUid_.clear();
emit invitationAccepted();
} }
void void
......
...@@ -91,6 +91,7 @@ signals: ...@@ -91,6 +91,7 @@ signals:
void needToUpdateSmartList(); void needToUpdateSmartList();
void contactBanned(); void contactBanned();
void navigateToWelcomePageRequested(); void navigateToWelcomePageRequested();
void invitationAccepted();
public slots: public slots:
void slotSendMessageContentSaved(const QString& content); void slotSendMessageContentSaved(const QString& content);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment