Merge branch 'feature/issue-415/privacy' into release

Closes #415
phw198 · Jul 29, 2023 · 690f6bb · 690f6bb
2 parents e9b5c36 + d2bc89a
commit 690f6bb
Show file tree

Hide file tree

Showing 5 changed files with 73 additions and 13 deletions.
diff --git a/src/OutlookGoogleCalendarSync/Forms/MainForm.Designer.cs b/src/OutlookGoogleCalendarSync/Forms/MainForm.Designer.cs
diff --git a/src/OutlookGoogleCalendarSync/Forms/MainForm.cs b/src/OutlookGoogleCalendarSync/Forms/MainForm.cs
@@ -562,6 +562,7 @@ public void UpdateGUIsettings_Profile() {
                     cbExcludeFreeAllDays.Enabled = cbExcludeAllDays.Checked;
                     cbExcludeFree.Checked = profile.ExcludeFree;
                     cbExcludeTentative.Checked = profile.ExcludeTentative;
+                    cbExcludePrivate.Checked = profile.ExcludePrivate;
                     this.gbSyncOptions_What.ResumeLayout();
                     #endregion
                     #endregion
@@ -1577,7 +1578,7 @@ private void syncOptionSizing(GroupBox section, PictureBox sectionImage, Boolean
                 switch (section.Name.ToString().Split('_').LastOrDefault()) {
                     case "How": section.Height = btCloseRegexRules.Visible ? 251 : 198; break;
                     case "When": section.Height = 119; break;
-                    case "What": section.Height = 210; break;
+                    case "What": section.Height = 228; break;
                     case "Logging": section.Height = 111; break;
                     case "Proxy": section.Height = 197; break;
                 }
@@ -1970,6 +1971,12 @@ private void lWhatInfo_MouseHover(object sender, EventArgs e) {
         private void lWhatInfo_MouseLeave(object sender, EventArgs e) {
             showWhatPostit("Description");
         }
+        private void lWhatExcludeInfo_MouseHover(object sender, EventArgs e) {
+            showWhatPostit("AffectedExcludeItems");
+        }
+        private void lWhatExcludeInfo_MouseLeave(object sender, EventArgs e) {
+            showWhatPostit("Description");
+        }
         private void showWhatPostit(String info) {
             switch (info) {
                 case "Description": {
@@ -1985,6 +1992,12 @@ private void showWhatPostit(String info) {
                         WhatPostit.Visible = true;
                         break;
                     }
+                case "AffectedExcludeItems": {
+                        tbWhatHelp.Text = "Excluding items will delete those previously synced.\r" +
+                            "For more fine-grained control, consider filtering on categories.";
+                        WhatPostit.Visible = true;
+                        break;
+                    }
             }
             tbWhatHelp.SelectAll();
             tbWhatHelp.SelectionAlignment = HorizontalAlignment.Center;
@@ -2075,6 +2088,15 @@ private void cbSingleCategoryOnly_CheckedChanged(object sender, EventArgs e) {
             ActiveCalendarProfile.SingleCategoryOnly = cbSingleCategoryOnly.Checked;
         }
 
+        private void cbExcludeFree_CheckedChanged(object sender, EventArgs e) {
+            ActiveCalendarProfile.ExcludeFree = cbExcludeFree.Checked;
+        }
+        private void cbExcludeTentative_CheckedChanged(object sender, EventArgs e) {
+            ActiveCalendarProfile.ExcludeTentative = cbExcludeTentative.Checked;
+        }
+        private void cbExcludePrivate_CheckedChanged(object sender, EventArgs e) {
+            ActiveCalendarProfile.ExcludePrivate = cbExcludePrivate.Checked;
+        }
         private void cbExcludeAllDays_CheckedChanged(object sender, EventArgs e) {
             ActiveCalendarProfile.ExcludeAllDays = cbExcludeAllDays.Checked;
             cbExcludeFreeAllDays.Enabled = cbExcludeAllDays.Checked;
@@ -2083,13 +2105,6 @@ private void cbExcludeAllDays_CheckedChanged(object sender, EventArgs e) {
         private void cbExcludeFreeAllDays_CheckedChanged(object sender, EventArgs e) {
             ActiveCalendarProfile.ExcludeFreeAllDays = cbExcludeFreeAllDays.Checked;
         }
-
-        private void cbExcludeTentative_CheckedChanged(object sender, EventArgs e) {
-            ActiveCalendarProfile.ExcludeTentative = cbExcludeTentative.Checked;
-        }
-        private void cbExcludeFree_CheckedChanged(object sender, EventArgs e) {
-            ActiveCalendarProfile.ExcludeFree = cbExcludeFree.Checked;
-        }
         #endregion
         #endregion
         #region Application settings

diff --git a/src/OutlookGoogleCalendarSync/GoogleOgcs/GoogleCalendar.cs b/src/OutlookGoogleCalendarSync/GoogleOgcs/GoogleCalendar.cs
@@ -354,6 +354,13 @@ public List<Event> GetCalendarEntriesInRange(DateTime from, DateTime to) {
                         result = result.Except(allDays).ToList();
                     }
                 }
+                if (profile.ExcludePrivate) {
+                    List<Event> privacy = result.Where(ev => profile.ExcludePrivate && ev.Visibility == "private").ToList();
+                    if (privacy.Count > 0) {
+                        log.Debug(privacy.Count + " Google Private items excluded.");
+                        result = result.Except(privacy).ToList();
+                    }
+                }
             }
 
             if (profile.ExcludeDeclinedInvites) {

diff --git a/src/OutlookGoogleCalendarSync/OutlookOgcs/OutlookCalendar.cs b/src/OutlookGoogleCalendarSync/OutlookOgcs/OutlookCalendar.cs
@@ -175,6 +175,7 @@ public List<AppointmentItem> FilterCalendarEntries(SettingsStore.Calendar profil
 
                 Int32 allDayFiltered = 0;
                 Int32 availabilityFiltered = 0;
+                Int32 privacyFiltered = 0;
                 Int32 responseFiltered = 0;
 
                 foreach (Object obj in IOutlook.FilterItems(OutlookItems, filter)) {
@@ -214,7 +215,7 @@ public List<AppointmentItem> FilterCalendarEntries(SettingsStore.Calendar profil
                     else {
                         Boolean filtered = false;
 
-                        //Availability
+                        //Availability, Privacy
                         if (profile.SyncDirection.Id != Sync.Direction.GoogleToOutlook.Id) { //Sync direction means O->G will delete previously synced excluded items
                             if ((profile.ExcludeTentative && ai.BusyStatus == OlBusyStatus.olTentative) ||
                                 (profile.ExcludeFree && ai.BusyStatus == OlBusyStatus.olFree)) {
@@ -228,6 +229,10 @@ public List<AppointmentItem> FilterCalendarEntries(SettingsStore.Calendar profil
                                     filtered = true;
                                 if (filtered) { allDayFiltered++; continue; }
                             }
+
+                            if (profile.ExcludePrivate && ai.Sensitivity == OlSensitivity.olPrivate) {
+                                privacyFiltered++; continue;
+                            }
                         }
 
                         //Categories

diff --git a/src/OutlookGoogleCalendarSync/SettingsStore/Calendar.cs b/src/OutlookGoogleCalendarSync/SettingsStore/Calendar.cs
@@ -89,6 +89,7 @@ private void setDefaults() {
             ColourMaps = new ColourMappingDictionary();
             ExcludeFree = false;
             ExcludeTentative = false;
+            ExcludePrivate = false;
             ExcludeAllDays = false;
             ExcludeFreeAllDays = false;
 
@@ -184,6 +185,7 @@ [DataMember] public Boolean OutlookGalBlocked {
         public class ColourMappingDictionary : Dictionary<String, String> { }
         [DataMember] public bool ExcludeFree { get; set; }
         [DataMember] public bool ExcludeTentative { get; set; }
+        [DataMember] public bool ExcludePrivate { get; set; }        
         [DataMember] public bool ExcludeAllDays { get; set; }
         [DataMember] public bool ExcludeFreeAllDays { get; set; }
         #endregion
@@ -320,6 +322,7 @@ public void LogSettings() {
             log.Info("    ReminderDND: " + ReminderDND + " (" + ReminderDNDstart.ToString("HH:mm") + "-" + ReminderDNDend.ToString("HH:mm") + ")");
             log.Info("  ExcludeFree: " + ExcludeFree);
             log.Info("  ExcludeTentative: " + ExcludeTentative);
+            log.Info("  ExcludePrivate: " + ExcludePrivate);
             log.Info("  ExcludeAllDay: " + ExcludeAllDays + "; that are marked Free: " + ExcludeFreeAllDays);
         }