From a5e0f3c4534e567b18db14f32fdb752784653f49 Mon Sep 17 00:00:00 2001 From: Trung Nguyen <57174311+trungnt2910@users.noreply.github.com> Date: Mon, 6 Sep 2021 07:36:50 +0700 Subject: [PATCH] Fixed toast arg handling Null check for invalid toasts, as well as handling type name when deserializing JSON. --- TimetableApp/TimetableApp.Shared/App.xaml.cs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/TimetableApp/TimetableApp.Shared/App.xaml.cs b/TimetableApp/TimetableApp.Shared/App.xaml.cs index 4cbc5f3..802be56 100644 --- a/TimetableApp/TimetableApp.Shared/App.xaml.cs +++ b/TimetableApp/TimetableApp.Shared/App.xaml.cs @@ -213,8 +213,13 @@ protected override void OnActivated(IActivatedEventArgs e) ToastArguments args = ToastArguments.Parse(toastActivationArgs.Argument); var JsonString = args.Contains("lesson") ? args["lesson"] : null; - var lesson = JsonConvert.DeserializeObject(JsonString); - lesson.EnterClass(new StudentInfo() { Name = Settings.UserName }); + if (JsonString != null) + { + var lesson = JsonConvert.DeserializeObject(JsonString, + new JsonSerializerSettings() + { TypeNameHandling = TypeNameHandling.Auto }); + lesson.EnterClass(new StudentInfo() { Name = Settings.UserName }); + } } } }