MarkMessageAsRead() - Remove null execution path

abhinavminhas · Jul 27, 2024 · df6e060 · df6e060
1 parent 544d460
commit df6e060
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/GmailAPIHelper/GmailHelper.cs b/GmailAPIHelper/GmailHelper.cs
@@ -998,12 +998,17 @@ public static bool MarkMessageAsRead(this GmailService gmailService, string quer
             }
             if (messages.Count > 0)
             {
+                var isModified = false;
                 var latestMessage = messages.OrderByDescending(item => item.InternalDate).FirstOrDefault();
-                var modifyMessageRequest = service.Users.Messages.Modify(mods, userId, latestMessage.Id);
-                modifyMessageRequest.Execute();
+                if (latestMessage != null)
+                {
+                    var modifyMessageRequest = service.Users.Messages.Modify(mods, userId, latestMessage.Id);
+                    modifyMessageRequest.Execute();
+                    isModified = true;
+                }
                 if (disposeGmailService)
                     service.DisposeGmailService();
-                return true;
+                return isModified;
             }
             if (disposeGmailService)
                 service.DisposeGmailService();