Quietly log failure to get CurrentUser if GAL blocked.

Handle nulls in colour map. Attempt saving again if settings.xml file locked when upgrading config.
phw198 · Feb 13, 2022 · 6551fa5 · 6551fa5
1 parent e0b66b4
commit 6551fa5
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 15 deletions.
diff --git a/src/OutlookGoogleCalendarSync/Extensions/ColourPicker.cs b/src/OutlookGoogleCalendarSync/Extensions/ColourPicker.cs
@@ -248,7 +248,7 @@ public override void InitializeEditingControl(int rowIndex, object initialFormat
                     ctl.SelectedIndex = 0;
                 else {
                     String currentText = this.Value.ToString();
-                    if (ctl.Items.Count == 0) 
+                    if (ctl.Items.Count == 0)
                         ctl.PopulateDropdownItems();
                     if (!string.IsNullOrEmpty(currentText)) this.Value = currentText;
 
@@ -289,7 +289,7 @@ protected override void Paint(System.Drawing.Graphics graphics, System.Drawing.R
                     return;
 
                 foreach (GoogleOgcs.EventColour.Palette ci in Forms.ColourMap.GoogleComboBox.Items) {
-                    if (ci.Name == this.Value.ToString()) {
+                    if (ci.Name == this.Value?.ToString()) {
                         Brush boxBrush = new SolidBrush(ci.RgbValue);
                         Brush textBrush = SystemBrushes.WindowText;
                         Extensions.ColourCombobox.DrawComboboxItemColour(true, boxBrush, textBrush, this.Value.ToString(), graphics, cellBounds);

diff --git a/src/OutlookGoogleCalendarSync/Forms/ColourMap.cs b/src/OutlookGoogleCalendarSync/Forms/ColourMap.cs
@@ -119,7 +119,7 @@ private void btOK_Click(object sender, EventArgs e) {
                 log.Fine("Storing colour mappings in Settings.");
                 profile.ColourMaps.Clear();
                 foreach (DataGridViewRow row in colourGridView.Rows) {
-                    if (row.Cells["OutlookColour"].Value == null || row.Cells["OutlookColour"].Value.ToString().Trim() == "") continue;
+                    if (string.IsNullOrEmpty(row.Cells["OutlookColour"].Value?.ToString()?.Trim()) || string.IsNullOrEmpty(row.Cells["GoogleColour"].Value?.ToString()?.Trim())) continue;
                     try {
                         profile.ColourMaps.Add(row.Cells["OutlookColour"].Value.ToString(), GoogleOgcs.EventColour.Palette.GetColourId(row.Cells["GoogleColour"].Value.ToString()));
                     } catch (System.ArgumentException ex) {
@@ -207,7 +207,7 @@ private void ddOutlookColour_SelectedIndexChanged(object sender, EventArgs e) {
                 ddGoogleColour.SelectedIndexChanged -= ddGoogleColour_SelectedIndexChanged;
 
                 foreach (DataGridViewRow row in colourGridView.Rows) {
-                    if (row.Cells["OutlookColour"].Value.ToString() == ddOutlookColour.SelectedItem.Text && !string.IsNullOrEmpty(row.Cells["GoogleColour"].Value.ToString())) {
+                    if (row.Cells["OutlookColour"].Value.ToString() == ddOutlookColour.SelectedItem.Text && !string.IsNullOrEmpty(row.Cells["GoogleColour"].Value?.ToString())) {
                         String colourId = GoogleOgcs.EventColour.Palette.GetColourId(row.Cells["GoogleColour"].Value.ToString());
                         ddGoogleColour.SelectedIndex = Convert.ToInt16(colourId);
                         return;

diff --git a/src/OutlookGoogleCalendarSync/OutlookOgcs/OutlookNew.cs b/src/OutlookGoogleCalendarSync/OutlookOgcs/OutlookNew.cs
@@ -264,10 +264,10 @@ public NameSpace GetCurrentUser(NameSpace oNS) {
                     currentUserSMTP = GetRecipientEmail(currentUser);
                     currentUserName = currentUser.Name;
                 } catch (System.Exception ex) {
+                    log.Warn("OGCS is unable to interogate CurrentUser from Outlook.");
                     if (OGCSexception.GetErrorCode(ex) == "0x80004004") { //E_ABORT
                         log.Warn("Corporate policy or possibly anti-virus is blocking access to GAL.");
-                    } else OGCSexception.Analyse(ex);
-                    log.Warn("OGCS is unable to interogate CurrentUser from Outlook.");
+                    } else OGCSexception.Analyse(OGCSexception.LogAsFail(ex));
                     profile.OutlookGalBlocked = true;
                     return oNS;
                 }

diff --git a/src/OutlookGoogleCalendarSync/OutlookOgcs/OutlookOld.cs b/src/OutlookGoogleCalendarSync/OutlookOgcs/OutlookOld.cs
@@ -217,10 +217,10 @@ public NameSpace GetCurrentUser(NameSpace oNS) {
                             delay = maxDelay;
                         } catch (System.Exception ex2) {
                             if (delay == maxDelay) {
+                                log.Warn("OGCS is unable to obtain CurrentUser from Outlook.");
                                 if (OGCSexception.GetErrorCode(ex2) == "0x80004004") { //E_ABORT
                                     log.Warn("Corporate policy or possibly anti-virus is blocking access to GAL.");
-                                } else OGCSexception.Analyse(ex2);
-                                log.Warn("OGCS is unable to obtain CurrentUser from Outlook.");
+                                } else OGCSexception.Analyse(OGCSexception.LogAsFail(ex2));
                                 profile.OutlookGalBlocked = true;
                                 return oNS;
                             }

diff --git a/src/OutlookGoogleCalendarSync/SettingsStore/Settings.cs b/src/OutlookGoogleCalendarSync/SettingsStore/Settings.cs
@@ -454,7 +454,7 @@ public static SettingsStore.Calendar InPlay() {
                 SettingsStore.Calendar aProfile;
 
                 if (Program.CalledByProcess("manualSynchronize,Sync_Click,updateGUIsettings,UpdateGUIsettings_Profile,miCatRefresh_Click," +
-                    "GetMyGoogleCalendars_Click,btColourMap_Click,ColourPicker_Enter,OnSelectedIndexChanged,OnCheckedChanged")) {
+                    "GetMyGoogleCalendars_Click,btColourMap_Click,btTestOutlookFilter_Click,ColourPicker_Enter,OnSelectedIndexChanged,OnCheckedChanged")) {
                     aProfile = Forms.Main.Instance.ActiveCalendarProfile;
                     log.Fine("Using profile Forms.Main.Instance.ActiveCalendarProfile");
 
@@ -467,6 +467,7 @@ public static SettingsStore.Calendar InPlay() {
                     log.Error("Unknown profile being referenced.");
                     aProfile = Forms.Main.Instance.ActiveCalendarProfile;
                 }
+                if (aProfile == null) log.Warn("The profile in play is NULL!");
                 return aProfile;
             }
         }

diff --git a/src/OutlookGoogleCalendarSync/SettingsStore/Upgrade.cs b/src/OutlookGoogleCalendarSync/SettingsStore/Upgrade.cs
@@ -131,11 +131,24 @@ private static void upgradeToMultiCalendar() {
             } finally {
                 if (xml != null) {
                     xml.Root.Sort();
-                    try {
-                        xml.Save(Settings.ConfigFile);
-                    } catch (System.Exception ex) {
-                        OGCSexception.Analyse("Could not save upgraded settings file " + Settings.ConfigFile, ex);
-                        throw ex;
+                    while (true) {
+                        try {
+                            xml.Save(Settings.ConfigFile);
+                            break;
+                        } catch (System.IO.IOException ex) {
+                            log.Fail("Another process has locked file " + Settings.ConfigFile);
+                            if (MessageBox.Show("Another program is using the settings file " + Settings.ConfigFile +
+                                "\r\nPlease close any other instance of OGCS that may be using it.",
+                                "Settings Cannot Be Saved", MessageBoxButtons.RetryCancel, MessageBoxIcon.Exclamation) == DialogResult.Cancel) 
+                            {
+                                log.Warn("User cancelled attempt to save new settings file.");
+                                OGCSexception.Analyse("Could not save upgraded settings file " + Settings.ConfigFile, ex);
+                                throw;
+                            }
+                        } catch (System.Exception ex) {
+                            OGCSexception.Analyse("Could not save upgraded settings file " + Settings.ConfigFile, ex);
+                            throw;
+                        }
                     }
                 }
             }

diff --git a/src/OutlookGoogleCalendarSync/Sync/Calendar.cs b/src/OutlookGoogleCalendarSync/Sync/Calendar.cs
@@ -270,7 +270,7 @@ private void skipCorruptedItem(ref List<AppointmentItem> outlookEntries, Appoint
                             itemSummary = cai.Subject;
                         }
                     }
-                    Forms.Main.Instance.Console.Update("<p>" + itemSummary + "</p><p>There is probem with this item - it will not be synced.</p><p>" + errMsg + "</p>",
+                    Forms.Main.Instance.Console.Update("<p>" + itemSummary + "</p><p>There is problem with this item - it will not be synced.</p><p>" + errMsg + "</p>",
                         Console.Markup.warning, logit: true);
 
                 } finally {