fix crash when clicking on toasts, make toast handling more resilient

Author: Trolldemorted

Signal-Windows/App.xaml.cs

@@ -95,7 +95,8 @@ protected override async void OnActivated(IActivatedEventArgs args)
             Logger.LogInformation("OnActivated() {0}", args.GetType());
             if (args is ToastNotificationActivatedEventArgs toastArgs)
             {
-                bool createdMainWindow = await CreateMainWindow(toastArgs.Argument);
+                string requestedConversation = toastArgs.Argument;
+                bool createdMainWindow = await CreateMainWindow(requestedConversation);
                 if (!createdMainWindow)
                 {
                     if (args is IViewSwitcherProvider viewSwitcherProvider && viewSwitcherProvider.ViewSwitcher != null)
@@ -107,13 +108,13 @@ protected override async void OnActivated(IActivatedEventArgs args)
                             await Views[currentId].Dispatcher.RunTaskAsync(() =>
                             {
                                 Logger.LogInformation("OnActivated() selecting conversation");
-                                Views[currentId].Locator.MainPageInstance.SelectConversation(toastArgs.Argument);
+                                Views[currentId].Locator.MainPageInstance.TrySelectConversation(requestedConversation);
                             });
                             await ApplicationViewSwitcher.TryShowAsStandaloneAsync(currentId);
                         }
                         else
                         {
-                            await CreateSecondaryWindowOrShowMain(switcher, toastArgs.Argument);
+                            await CreateSecondaryWindowOrShowMain(switcher, requestedConversation);
                         }
                     }
                     else

Signal-Windows/ViewModels/MainPageViewModel.cs

@@ -148,9 +148,16 @@ internal async Task SendMessageButton_Click(TextBox messageTextBox)
             messageTextBox.Focus(FocusState.Programmatic);
         }
 
-        public void SelectConversation(string conversationId)
+        public void TrySelectConversation(string conversationId)
         {
-            SelectedConversation = ConversationsDictionary[conversationId];
+            if (ConversationsDictionary.ContainsKey(conversationId))
+            {
+                SelectedConversation = ConversationsDictionary[conversationId];
+            }
+            else
+            {
+                Logger.LogError("TrySelectConversation could not select conversation: key is not present");
+            }
         }
 
         public void ConversationsList_SelectionChanged(object sender, SelectionChangedEventArgs e)
@@ -276,17 +283,17 @@ public void ReplaceConversationList(List<SignalConversation> conversations)
             {
                 ConversationsDictionary.Add(c.ThreadId, c);
             }
-            if (SelectedThread != null)
-            {
-                Logger.LogDebug("SelectedThread is != null, refreshing");
-                SelectedThread = ConversationsDictionary[SelectedThread.ThreadId];
-                SelectConversation(SelectedThread.ThreadId);
-            }
-
             if (RequestedConversationId != null && RequestedConversationId != "")
             {
                 Logger.LogDebug("RequestedConversationId is != null, refreshing");
-                SelectConversation(RequestedConversationId);
+                TrySelectConversation(RequestedConversationId);
+                RequestedConversationId = null;
+            }
+            else if (SelectedThread != null)
+            {
+                Logger.LogDebug("SelectedThread is != null, refreshing");
+                SelectedThread = ConversationsDictionary[SelectedThread.ThreadId];
+                TrySelectConversation(SelectedThread.ThreadId);
             }
         }
 

Signal-Windows/Views/MainPage.xaml.cs

@@ -85,14 +85,6 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
             UpdateLayout();
             SwitchToStyle(GetCurrentViewStyle());
             MainPanel.DisplayMode = SplitViewDisplayMode.CompactInline;
-            if (Vm.RequestedConversationId != null && Vm.RequestedConversationId != "")
-            {
-                Vm.SelectConversation(Vm.RequestedConversationId);
-            }
-            else if (Vm.SelectedThread != null)
-            {
-                ConversationControl.Load(Vm.SelectedThread);
-            }
             Frame.SizeChanged += Frame_SizeChanged;
         }