added IOutlookCalendarService and move interop and netoffice to inher…

…it it.
JaySmith-zz · Feb 16, 2015 · 593efa2 · 593efa2
1 parent 2711413
commit 593efa2
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/Marble/Core/CalendarSync.cs b/Marble/Core/CalendarSync.cs
@@ -14,7 +14,7 @@ namespace Marble
 	/// </summary>
 	public class CalendarSync
 	{
-		readonly OutlookCalendarService outlookCalendarService;
+		readonly IOutlookCalendarService outlookCalendarService;
 
 		readonly GoogleClient googleClient;
 		readonly GoogleCalendarService googleCalendarService;
@@ -24,7 +24,12 @@ public CalendarSync()
 			googleClient = new GoogleClient(Settings.DataStoreFolderNameCalendar);
 			googleCalendarService = new GoogleCalendarService(googleClient);
 
-			outlookCalendarService = new OutlookCalendarService();
+			if ( Settings.OutlookCalendarServiceProvider == "Interop")
+			{
+				outlookCalendarService = new OulookCalendarService_Introp();
+			} else {
+				outlookCalendarService = new OutlookCalendarService();
+			}
 		}
 
 		public void Sync()

diff --git a/Marble/Outlook/OulookCalendarService_Introp.cs b/Marble/Outlook/OulookCalendarService_Introp.cs
@@ -100,5 +100,4 @@ static List<string> GetAttendees(string attendees)
 		}
 	}
 
-
 }
diff --git a/Marble/Outlook/OutlookCalendarService.cs b/Marble/Outlook/OutlookCalendarService.cs
@@ -3,14 +3,13 @@
 using NetOffice.OutlookApi;
 using NetOffice.OutlookApi.Enums;
 using Marble.Data;
-using System.Globalization;
 
-namespace Marble.Outlook
+namespace Marble
 {
     /// <summary>
     /// Description of OutlookClient.
     /// </summary>
-    public class OutlookCalendarService
+    public class OutlookCalendarService : IOutlookCalendarService
     {
         public MAPIFolder outlookCalendar;
 

diff --git a/Marble/Properties/AssemblyInfo.cs b/Marble/Properties/AssemblyInfo.cs
@@ -25,7 +25,7 @@
 [assembly: ComVisible(false)]
 
 // Following Symantic Version http://semver.org/
-[assembly: AssemblyVersion("0.0.1.7")]
+[assembly: AssemblyVersion("0.0.1.8")]
 
 public class AssemblyInfo
 {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -100,5 +100,4 @@ static List<string> GetAttendees(string attendees)
		}
		}


		}