Skip to content

Commit 4fdc523

Browse files
committed
fix selection of conversations when activating by notification
1 parent f09ba5d commit 4fdc523

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

Signal-Windows/ViewModels/MainPageViewModel.cs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -150,14 +150,10 @@ internal async Task SendMessageButton_Click(TextBox messageTextBox)
150150

151151
public void TrySelectConversation(string conversationId)
152152
{
153-
if (ConversationsDictionary.ContainsKey(conversationId))
153+
if (conversationId != null && ConversationsDictionary.ContainsKey(conversationId))
154154
{
155155
SelectedConversation = ConversationsDictionary[conversationId];
156156
}
157-
else
158-
{
159-
Logger.LogError("TrySelectConversation could not select conversation: key is not present");
160-
}
161157
}
162158

163159
public void ConversationsList_SelectionChanged(object sender, SelectionChangedEventArgs e)
@@ -278,7 +274,6 @@ public void ReplaceConversationList(List<SignalConversation> conversations)
278274
ConversationsDictionary.Clear();
279275
Conversations.Clear();
280276
Conversations.AddRange(conversations);
281-
282277
foreach (var c in Conversations)
283278
{
284279
ConversationsDictionary.Add(c.ThreadId, c);

Signal-Windows/Views/MainPage.xaml.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
8686
SwitchToStyle(GetCurrentViewStyle());
8787
MainPanel.DisplayMode = SplitViewDisplayMode.CompactInline;
8888
Frame.SizeChanged += Frame_SizeChanged;
89+
Vm.TrySelectConversation(Vm.RequestedConversationId);
8990
}
9091

9192
protected override void OnNavigatingFrom(NavigatingCancelEventArgs e)

0 commit comments

Comments
 (0)