Fixed toast arg handling

Null check for invalid toasts, as well as handling type name when deserializing JSON.
AzureAms · Sep 6, 2021 · a5e0f3c · a5e0f3c
1 parent 57c3b0d
commit a5e0f3c
Showing 1 changed file with 7 additions and 2 deletions.
diff --git 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<Lesson>(JsonString);
-                lesson.EnterClass(new StudentInfo() { Name = Settings.UserName });
+                if (JsonString != null)
+                {
+                    var lesson = JsonConvert.DeserializeObject<Lesson>(JsonString, 
+                        new JsonSerializerSettings() 
+                        { TypeNameHandling = TypeNameHandling.Auto });
+                    lesson.EnterClass(new StudentInfo() { Name = Settings.UserName });
+                }
             }
         }
     }