Merge branch 'o365-work' into origin365

Conflicts:
	README.md

Author: msftjayongg

OneNoteServiceSamplesWinUniversal.Shared/App.xaml.cs

@@ -40,6 +40,20 @@ public App()
             this.Suspending += this.OnSuspending;
         }
 
+		protected async override void OnActivated(IActivatedEventArgs e)
+		{
+#if WINDOWS_PHONE_APP
+			var rootFrame = Window.Current.Content as Frame;
+
+			var wabPage = rootFrame.Content as IWebAuthenticationContinuable;
+			if (wabPage != null)
+			{
+				wabPage.ContinueWebAuthentication(e as WebAuthenticationBrokerContinuationEventArgs);
+			}
+#endif
+			Window.Current.Activate();
+		}
+
         /// <summary>
         /// Invoked when the application is launched normally by the end user.  Other entry points
         /// will be used when the application is launched to open a specific file, to display

OneNoteServiceSamplesWinUniversal.Shared/Common/AppSettings.cs

@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Windows.Storage;
+
+namespace OneNoteServiceSamplesWinUniversal.Common
+{
+    public static class AppSettings
+    {
+		public static bool GetProviderO365()
+		{
+			object result = false;
+			ApplicationData.Current.LocalSettings.Values.TryGetValue("ProviderO365", out result);
+			return (bool)(result ?? false);
+		}
+		public static void SetProviderO365(bool isO365)
+		{
+			ApplicationData.Current.LocalSettings.Values["ProviderO365"] = isO365;
+		}
+
+		public static bool GetUseBeta()
+		{
+			object result = false;
+			ApplicationData.Current.LocalSettings.Values.TryGetValue("UseBeta", out result);
+			return (bool)(result ?? true); // default to true
+		}
+		public static void SetUseBeta(bool useBeta)
+		{
+			ApplicationData.Current.LocalSettings.Values["UseBeta"] = useBeta;
+		}
+	}
+}

OneNoteServiceSamplesWinUniversal.Shared/Common/NavigationHelper.cs

@@ -9,6 +9,7 @@
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Navigation;
+using OneNoteServiceSamplesWinUniversal.OneNoteApi;
 
 namespace OneNoteServiceSamplesWinUniversal.Common
 {
@@ -307,14 +308,14 @@ private void CoreWindow_PointerPressed(CoreWindow sender,
         /// </summary>
         public event SaveStateEventHandler SaveState;
 
-        /// <summary>
-        /// Invoked when this page is about to be displayed in a Frame.  
-        /// This method calls <see cref="LoadState"/>, where all page specific
-        /// navigation and process lifetime management logic should be placed.
-        /// </summary>
-        /// <param name="e">Event data that describes how this page was reached.  The Parameter
-        /// property provides the group to be displayed.</param>
-        public void OnNavigatedTo(NavigationEventArgs e)
+	    /// <summary>
+	    /// Invoked when this page is about to be displayed in a Frame.  
+	    /// This method calls <see cref="LoadState"/>, where all page specific
+	    /// navigation and process lifetime management logic should be placed.
+	    /// </summary>
+	    /// <param name="e">Event data that describes how this page was reached.  The Parameter
+	    /// property provides the group to be displayed.</param>
+	    public void OnNavigatedTo(NavigationEventArgs e)
         {
             var frameState = SuspensionManager.SessionStateForFrame(this.Frame);
             this._pageKey = "Page-" + this.Frame.BackStackDepth;

OneNoteServiceSamplesWinUniversal.Shared/DataModel/ItemPageModel.cs

@@ -11,12 +11,16 @@ namespace OneNoteServiceSamplesWinUniversal.DataModel
 {
 	public class ItemPageModel : INotifyPropertyChanged
 	{
-		private string _authUserName = null;  // Logged in user name
-		private SampleDataItem _item = null;  // Info about the current item
-		private object _apiResponse = null;  // Response from an API request - Either a ApiBaseResponse or a List<ApiBaseResponse>
-		private ApiBaseResponse _selectedResponse = null;  // Holds a reference to the currently selected response
+		private string _authUserName = null; // Logged in user name
+		private SampleDataItem _item = null; // Info about the current item
+		private HubContext _userData = null;
+		private object _apiResponse = null;
+			// Response from an API request - Either a ApiBaseResponse or a List<ApiBaseResponse>
 
-		public event PropertyChangedEventHandler PropertyChanged;  // Implements INotifyPropertyChanged for notifying the binding engine when an attribute changes
+		private ApiBaseResponse _selectedResponse = null; // Holds a reference to the currently selected response
+
+		public event PropertyChangedEventHandler PropertyChanged;
+			// Implements INotifyPropertyChanged for notifying the binding engine when an attribute changes
 
 		/// <summary>
 		// NotifyPropertyChanged will fire the PropertyChanged event, 
@@ -32,10 +36,7 @@ public void NotifyPropertyChanged(string propertyName)
 
 		public string AuthUserName
 		{
-			get
-			{
-				return _authUserName;
-			}
+			get { return _authUserName; }
 
 			set
 			{
@@ -45,27 +46,9 @@ public string AuthUserName
 			}
 		}
 
-		public string SignInButtonTitle
-		{
-			get
-			{
-				string title = "Sign In";
-
-				if (Auth.IsSignedIn)
-				{
-					title = "Sign Out";
-				}
-
-				return title;
-			}
-		}
-
 		public SampleDataItem Item
 		{
-			get
-			{
-				return _item;
-			}
+			get { return _item; }
 
 			set
 			{
@@ -76,6 +59,7 @@ public SampleDataItem Item
 
 		public object ApiResponse
 		{
+			get { return _apiResponse as ApiBaseResponse; }
 			set
 			{
 				_apiResponse = value;
@@ -85,14 +69,18 @@ public object ApiResponse
 
 				if (_apiResponse != null)
 				{
-					if (_apiResponse is ApiBaseResponse)
+					var response = _apiResponse as ApiBaseResponse;
+					if (response != null)
 					{
-						selectedResponse = _apiResponse as ApiBaseResponse;
+						selectedResponse = response;
 					}
 					else
 					{
-						List<ApiBaseResponse> multipleResponses = _apiResponse as List<ApiBaseResponse>;
-						selectedResponse = multipleResponses[0];
+						var multipleResponses = _apiResponse as List<ApiBaseResponse>;
+						if (multipleResponses != null)
+						{
+							selectedResponse = multipleResponses[0];
+						}
 					}
 				}
 
@@ -105,15 +93,13 @@ public object ApiResponse
 				NotifyPropertyChanged("IsClientUrlAvailable");
 				NotifyPropertyChanged("ResponseList");
 				NotifyPropertyChanged("SelectedResponse");
+				NotifyPropertyChanged("CorrelationId");
 			}
 		}
 
 		public ApiBaseResponse SelectedResponse
 		{
-			get
-			{
-				return _selectedResponse;
-			}
+			get { return _selectedResponse; }
 
 			set
 			{
@@ -123,6 +109,17 @@ public ApiBaseResponse SelectedResponse
 			}
 		}
 
+		public HubContext UserData
+		{
+			get { return _userData; }
+
+			set
+			{
+				_userData = value;
+				NotifyPropertyChanged("TimeStamp");
+			}
+		}
+
 		public string StatusCode
 		{
 			get
@@ -135,7 +132,7 @@ public string StatusCode
 
 					if (statusCode != 0)
 					{
-						statusCodeString = string.Format("{0}-{1}", (int)statusCode, statusCode.ToString());
+						statusCodeString = string.Format("{0}-{1}", (int) statusCode, statusCode.ToString());
 					}
 				}
 
@@ -149,7 +146,7 @@ public string Body
 			{
 				string body = string.Empty;
 
-				if (_selectedResponse != null)
+				if (_selectedResponse != null && _selectedResponse.Body != null)
 				{
 					body = _selectedResponse.Body;
 				}
@@ -175,10 +172,7 @@ public Thickness BodyBorderThikness
 
 		public bool IsResponseAvailable
 		{
-			get
-			{
-				return _apiResponse != null;
-			}
+			get { return _apiResponse != null; }
 		}
 
 		public Visibility IsResponseListAvailable
@@ -198,10 +192,7 @@ public Visibility IsResponseListAvailable
 
 		public List<ApiBaseResponse> ResponseList
 		{
-			get
-			{
-				return _apiResponse as List<ApiBaseResponse>;
-			}
+			get { return _apiResponse as List<ApiBaseResponse>; }
 		}
 
 		public Visibility IsClientUrlAvailable
@@ -248,5 +239,23 @@ public string OneNoteWebUrl
 				return webUrl;
 			}
 		}
+
+		public string CorrelationId
+		{
+			get
+			{
+				return _selectedResponse != null && !string.IsNullOrEmpty(_selectedResponse.CorrelationId)
+					? _selectedResponse.CorrelationId
+					: string.Empty;
+			}
+		}
+
+		public string TimeStamp
+		{
+			get
+			{
+				return _userData != null ? _userData.TimeStamp.ToString() : string.Empty;
+			}
+		}
 	}
 }