Merge branch 'feature/issue-1259' into release

Closes #1259
phw198 · Oct 26, 2023 · de24bc5 · de24bc5
2 parents 5e9f4a4 + 5ebcfd1
commit de24bc5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/OutlookGoogleCalendarSync/OutlookOgcs/OutlookCalendar.cs b/src/OutlookGoogleCalendarSync/OutlookOgcs/OutlookCalendar.cs
@@ -966,9 +966,11 @@ private OlSensitivity getPrivacy(String gVisibility, OlSensitivity? oSensitivity
         /// <param name="oBusyStatus">Outlook's current setting</param>
         private OlBusyStatus getAvailability(String gTransparency, OlBusyStatus? oBusyStatus) {
             SettingsStore.Calendar profile = Sync.Engine.Calendar.Instance.Profile;
-
+            List<String> persistOutlookStatus = new List<String> { OlBusyStatus.olTentative.ToString(), OlBusyStatus.olOutOfOffice.ToString(), "olWorkingElsewhere" };
+
             if (!profile.SetEntriesAvailable)
-                return (gTransparency == "transparent") ? OlBusyStatus.olFree : OlBusyStatus.olBusy;
+                return (gTransparency == "transparent") ? OlBusyStatus.olFree :  
+                    persistOutlookStatus.Contains(oBusyStatus.ToString()) ? (OlBusyStatus)oBusyStatus: OlBusyStatus.olBusy;
 
             OlBusyStatus overrideFbStatus = OlBusyStatus.olFree;
             try {
@@ -982,14 +984,16 @@ private OlBusyStatus getAvailability(String gTransparency, OlBusyStatus? oBusySt
             } else {
                 if (profile.TargetCalendar.Id == Sync.Direction.OutlookToGoogle.Id) { //Availability enforcement is in other direction
                     if (oBusyStatus == null)
-                        return (gTransparency == "transparent") ? OlBusyStatus.olFree : OlBusyStatus.olBusy;
+                        return (gTransparency == "transparent") ? OlBusyStatus.olFree :
+                            persistOutlookStatus.Contains(oBusyStatus.ToString()) ? (OlBusyStatus)oBusyStatus : OlBusyStatus.olBusy;
                     else
                         return (OlBusyStatus)oBusyStatus;
                 } else {
                     if (!profile.CreatedItemsOnly || (profile.CreatedItemsOnly && oBusyStatus == null))
                         return overrideFbStatus;
                     else
-                        return (gTransparency == "transparent") ? OlBusyStatus.olFree : OlBusyStatus.olBusy;
+                        return (gTransparency == "transparent") ? OlBusyStatus.olFree :
+                            persistOutlookStatus.Contains(oBusyStatus.ToString()) ? (OlBusyStatus)oBusyStatus : OlBusyStatus.olBusy;
                 }
             }
         }

diff --git a/src/OutlookGoogleCalendarSync/SettingsStore/Calendar.cs b/src/OutlookGoogleCalendarSync/SettingsStore/Calendar.cs
@@ -146,6 +146,7 @@ [DataMember] public Boolean OutlookGalBlocked {
         [DataMember] public bool SetEntriesPrivate { get; set; }
         [DataMember] public String PrivacyLevel { get; set; }
         [DataMember] public bool SetEntriesAvailable { get; set; }
+        /// <summary>Set availability status for all entries</summary>
         [DataMember] public String AvailabilityStatus { get; set; }
         [DataMember] public bool SetEntriesColour { get; set; }
         /// <summary>Set all Outlook appointments to this OlCategoryColor</summary>