Skip to content

Commit

Permalink
Rename
Browse files Browse the repository at this point in the history
  • Loading branch information
nertsch committed Feb 23, 2019
1 parent c76218f commit e817f84
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion CalDavSynchronizer/Ui/Options/IOptionTasks.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public interface IOptionTasks
Contracts.Options[] LoadOptions (string fileName);
Task<string> TestGoogleConnection(OptionsModel options, string url);
Task<string> TestWebDavConnection(OptionsModel options);
void ValidateBulkProfile (OptionsModel options, AccessPrivileges privileges, CalendarOwnerProperties ownerProperties);
void ValidateBulkProfile (OptionsModel options, AccessPrivileges privileges, CalendarOwnerProperties ownerPropertiesOrNull);

OutlookFolderDescriptor GetDefaultCalendarFolderOrNull();
}
Expand Down
2 changes: 1 addition & 1 deletion CalDavSynchronizer/Ui/Options/NullOptionTasks.cs
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public Task<string> TestWebDavConnection(OptionsModel options)
{
throw new NotImplementedException();
}
public void ValidateBulkProfile (OptionsModel options, AccessPrivileges privileges, CalendarOwnerProperties ownerProperties)
public void ValidateBulkProfile (OptionsModel options, AccessPrivileges privileges, CalendarOwnerProperties ownerPropertiesOrNull)
{
throw new NotImplementedException();
}
Expand Down
8 changes: 4 additions & 4 deletions CalDavSynchronizer/Ui/Options/OptionTasks.cs
Original file line number Diff line number Diff line change
Expand Up @@ -675,18 +675,18 @@ public async Task<string> TestWebDavConnection(OptionsModel options)
return autoDiscoveredUrl.ToString();
}

public void ValidateBulkProfile (OptionsModel options, AccessPrivileges privileges, CalendarOwnerProperties ownerProperties)
public void ValidateBulkProfile (OptionsModel options, AccessPrivileges privileges, CalendarOwnerProperties ownerPropertiesOrNull)
{
if (!privileges.HasFlag (AccessPrivileges.Modify) && DoesModeRequireWriteableServerResource (options.SynchronizationMode))
{
options.SynchronizationMode = SynchronizationMode.ReplicateServerIntoOutlook;
}

if (ownerProperties != null)
if (ownerPropertiesOrNull != null)
{
options.EmailAddress = ownerProperties.CalendarOwnerEmail;
options.EmailAddress = ownerPropertiesOrNull.CalendarOwnerEmail;

if (ownerProperties.IsSharedCalendar && privileges.HasFlag (AccessPrivileges.Create))
if (ownerPropertiesOrNull.IsSharedCalendar && privileges.HasFlag (AccessPrivileges.Create))
{
var eventMappingConfigurationModel = (EventMappingConfigurationModel) options.MappingConfigurationModelOrNull;
eventMappingConfigurationModel.OrganizerAsDelegate = true;
Expand Down

0 comments on commit e817f84

Please sign in to comment.