Added better error reporting for setting a user image url and added feedback within the config window

georgeduckett · georgeduckett · commit ae2de99b695e · 2017-08-03T21:55:55.000+01:00
diff --git a/TeamCoding/Options/OptionsPage.xaml b/TeamCoding/Options/OptionsPage.xaml
@@ -12,7 +12,10 @@
                 <Grid>
                     <TextBox x:Name="txtUsername" Margin="111,10,109,0" Height="26" VerticalAlignment="Top" Text="{Binding Username, Mode=TwoWay}" ToolTip="Set a custom username. Blank to auto-calculate" AutomationProperties.LabeledBy="{Binding ElementName=lblUsername, Mode=OneWay}"/>
                     <Label x:Name="lblUsername" Content="Username" HorizontalAlignment="Left" VerticalAlignment="Top" Target="{Binding ElementName=txtUsername, Mode=OneWay}" Margin="0,10,0,0"/>
-                    <TextBox x:Name="txtUserImageUrl" Margin="111,44,0,0" Height="23" VerticalAlignment="Top" Text="{Binding UserImageUrl}" ToolTip="Set a custom image url. Blank to auto-calculate" AutomationProperties.LabeledBy="{Binding ElementName=lblUserImageUrl, Mode=OneWay}"/>
+                    <TextBox x:Name="txtUserImageUrl" Margin="111,44,28,0" Height="23" VerticalAlignment="Top" Text="{Binding UserImageUrl}" ToolTip="Set a custom image url. Blank to auto-calculate" AutomationProperties.LabeledBy="{Binding ElementName=lblUserImageUrl, Mode=OneWay}"/>
+                    <Viewbox Stretch="Uniform" Margin="0,44,0,0" HorizontalAlignment="Right" Width="23" Height="23" VerticalAlignment="Top">
+                        <TextBlock x:Name="tbUserImageUrl" />
+                    </Viewbox>
                     <Label x:Name="lblUserImageUrl" Content="User Url" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="0,41,0,0" Target="{Binding ElementName=txtUserImageUrl, Mode=OneWay}"/>
                     <ComboBox x:Name="txtUserTabDisplay" Margin="111,72,0,0" Height="23" VerticalAlignment="Top" ItemsSource="{Binding UserDisplaySettings}" SelectedValue="{Binding UserTabDisplay}" ToolTip="How to display other users in document tabs." AutomationProperties.LabeledBy="{Binding ElementName=lblUserTabDisplay, Mode=OneWay}"/>
                     <Label x:Name="lblUserTabDisplay" Content="User Tab Display" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="0,69,0,0" Target="{Binding ElementName=txtUserTabDisplay, Mode=OneWay}"/>
diff --git a/TeamCoding/Options/OptionsPage.xaml.cs b/TeamCoding/Options/OptionsPage.xaml.cs
@@ -46,21 +46,31 @@ public OptionsPage(OptionPageGrid optionPageGrid)
                 comboBox.LostKeyboardFocus += ComboBox_LostKeyboardFocus;
             }
 
+            string bindingPath;
             foreach(var textBox in grpPersistence.FindChildren<TextBox>())
             {
-                var bindingPath = (textBox).GetBindingExpression(TextBox.TextProperty)?.ParentBinding?.Path?.Path;
+                bindingPath = textBox.GetBindingExpression(TextBox.TextProperty)?.ParentBinding?.Path?.Path;
                 
                 if(bindingPath != null)
                 {
                     TextBoxIsValidTaskCancelSources.Add(textBox, new CancellationTokenSource());
                     textBox.LostKeyboardFocus += PersistencePropertyBoundTextBox_KeyboardLostFocus;
-                    textBox.TextChanged += PersistencePropertyBoundTextBox_TextChanged;
+                    textBox.TextChanged += PropertyBoundTextBox_TextChanged;
                 }
             }
 
+            bindingPath = txtUserImageUrl.GetBindingExpression(TextBox.TextProperty)?.ParentBinding?.Path?.Path;
+
+            if (bindingPath != null)
+            {
+                TextBoxIsValidTaskCancelSources.Add(txtUserImageUrl, new CancellationTokenSource());
+                txtUserImageUrl.LostKeyboardFocus += UserPropertyBoundTextBox_KeyboardLostFocus;
+                txtUserImageUrl.TextChanged += PropertyBoundTextBox_TextChanged;
+            }
+
             Loaded += OptionsPage_Loaded;
         }
-        private void PersistencePropertyBoundTextBox_TextChanged(object sender, TextChangedEventArgs e)
+        private void PropertyBoundTextBox_TextChanged(object sender, TextChangedEventArgs e)
         {
             var textBox = (TextBox)sender;
             var bindingPath = textBox.GetBindingExpression(TextBox.TextProperty).ParentBinding.Path.Path;
@@ -72,10 +82,15 @@ private void PersistencePropertyBoundTextBox_TextChanged(object sender, TextChan
         private void PersistencePropertyBoundTextBox_KeyboardLostFocus(object sender, KeyboardFocusChangedEventArgs e)
         {
             var textBox = (TextBox)sender;
-            ReEvaluateTextboxSetting(textBox);
+            ReEvaluateTextboxSetting(textBox, TeamCodingPackage.Current.Settings.SharedSettings);
+        }
+        private void UserPropertyBoundTextBox_KeyboardLostFocus(object sender, KeyboardFocusChangedEventArgs e)
+        {
+            var textBox = (TextBox)sender;
+            ReEvaluateTextboxSetting(textBox, TeamCodingPackage.Current.Settings.UserSettings);
         }
 
-        private void ReEvaluateTextboxSetting(TextBox textBox)
+        private void ReEvaluateTextboxSetting(TextBox textBox, object settingsObject)
         {
             // Cancel any existing tasks to see if the new setting property is valid (since we're changing it anyway)
             TextBoxIsValidTaskCancelSources[textBox].Cancel();
@@ -93,7 +108,7 @@ private void ReEvaluateTextboxSetting(TextBox textBox)
                 textBlock.Foreground = Brushes.Black;
                 textBlock.Text = "⏳";
                 textBlock.ToolTip = "Checking configuration value...";
-                var settingProperty = (SettingProperty<string>)typeof(SharedSettings).GetField(bindingPath + "Property").GetValue(TeamCodingPackage.Current.Settings.SharedSettings);
+                var settingProperty = (SettingProperty<string>)settingsObject.GetType().GetField(bindingPath + "Property", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.Instance).GetValue(settingsObject);
 
                 // Add a new token to the dictionary to use with this task we're about to create
                 TextBoxIsValidTaskCancelSources[textBox] = new CancellationTokenSource();
@@ -137,16 +152,26 @@ private void OptionsPage_Loaded(object sender, RoutedEventArgs e)
 
             chkUsingJsonSettings.IsChecked = loadedFromFile;
 
+            string bindingPath;
+
             foreach (var textBox in grpPersistence.FindChildren<TextBox>())
             {
-                var bindingPath = textBox.GetBindingExpression(TextBox.TextProperty)?.ParentBinding?.Path?.Path;
+                bindingPath = textBox.GetBindingExpression(TextBox.TextProperty)?.ParentBinding?.Path?.Path;
 
                 if (bindingPath != null)
                 {
                     textBox.GetBindingExpression(TextBox.TextProperty).UpdateTarget();
-                    ReEvaluateTextboxSetting(textBox);
+                    ReEvaluateTextboxSetting(textBox, TeamCodingPackage.Current.Settings.SharedSettings);
                 }
             }
+
+            bindingPath = txtUserImageUrl.GetBindingExpression(TextBox.TextProperty)?.ParentBinding?.Path?.Path;
+
+            if (bindingPath != null)
+            {
+                txtUserImageUrl.GetBindingExpression(TextBox.TextProperty).UpdateTarget();
+                ReEvaluateTextboxSetting(txtUserImageUrl, TeamCodingPackage.Current.Settings.UserSettings);
+            }
         }
         private void Control_GotKeyboardFocus(object sender, KeyboardFocusChangedEventArgs e)
         {
diff --git a/TeamCoding/Options/UserSettings.cs b/TeamCoding/Options/UserSettings.cs
@@ -48,7 +48,7 @@ public UserSettings()
             UsernameProperty = new SettingProperty<string>(this);
             UsernameProperty.Changed += (s, e) => TeamCodingPackage.Current.Logger.WriteInformation($"Changing setting {nameof(Username)}: {Username}");
 
-            UserImageUrlProperty = new SettingProperty<string>(this);
+            UserImageUrlProperty = new SettingProperty<string>(this, CheckUserImageUrl);
             UserImageUrlProperty.Changed += (s, e) => TeamCodingPackage.Current.Logger.WriteInformation($"Changing setting {nameof(UserImageUrl)}: {UserImageUrl}");
 
             UserCodeDisplayProperty = new SettingProperty<UserDisplaySetting>(this);
@@ -60,5 +60,11 @@ public UserSettings()
             ShowAllBranchesProperty = new SettingProperty<bool>(this, null);
             ShowAllBranchesProperty.Changed += (s, e) => TeamCodingPackage.Current.Logger.WriteInformation($"Changing setting {nameof(ShowAllBranches)}: {ShowAllBranches}");
         }
+
+        private async Task<string> CheckUserImageUrl(string imageUrl)
+        {
+            var url = await TeamCodingPackage.Current.UserImages.GetImageFromUrl(imageUrl);
+            return null;
+        }
     }
 }
diff --git a/TeamCoding/VisualStudio/UserImageCache.cs b/TeamCoding/VisualStudio/UserImageCache.cs
@@ -12,6 +12,7 @@
 using Microsoft.VisualStudio.Shell;
 using TeamCoding.Options;
 using TeamCoding.VisualStudio.Controls;
+using System.Threading.Tasks;
 
 namespace TeamCoding.VisualStudio
 {
@@ -113,10 +114,7 @@ private void SetImageSource(UserAvatarModel context, IUserIdentity userIdentity)
                         {
                             try
                             {
-                                var request = await TeamCodingPackage.Current.HttpClient.GetAsync(userIdentity.ImageUrl);
-                                if (!request.IsSuccessStatusCode) return;
-                                var imageStream = await request.Content.ReadAsStreamAsync();
-                                context.AvatarImageSource = UrlImages[userIdentity.ImageUrl] = BitmapFrame.Create(imageStream, BitmapCreateOptions.None, BitmapCacheOption.OnLoad);
+                                context.AvatarImageSource = await GetImageFromUrl(userIdentity.ImageUrl);
                             }
                             catch (Exception ex) when (!System.Diagnostics.Debugger.IsAttached)
                             {
@@ -131,6 +129,14 @@ private void SetImageSource(UserAvatarModel context, IUserIdentity userIdentity)
                 context.AvatarImageSource = null;
             }
         }
+        public async Task<ImageSource> GetImageFromUrl(string url)
+        {
+            var request = await TeamCodingPackage.Current.HttpClient.GetAsync(url);
+            request.EnsureSuccessStatusCode();
+
+            var imageStream = await request.Content.ReadAsStreamAsync();
+            return UrlImages[url] = BitmapFrame.Create(imageStream, BitmapCreateOptions.None, BitmapCacheOption.OnLoad);
+        }
         /// <summary>
         /// Sets properties specific to a user control in a document tab
         /// </summary>

Original file line number	Diff line number	Diff line change
`@@ -46,21 +46,31 @@ public OptionsPage(OptionPageGrid optionPageGrid)`
`46`	`46`	`comboBox.LostKeyboardFocus += ComboBox_LostKeyboardFocus;`
`47`	`47`	`}`
`48`	`48`
	`49`	`+ string bindingPath;`
`49`	`50`	`foreach(var textBox in grpPersistence.FindChildren<TextBox>())`
`50`	`51`	`{`
`51`		`- var bindingPath = (textBox).GetBindingExpression(TextBox.TextProperty)?.ParentBinding?.Path?.Path;`
	`52`	`+ bindingPath = textBox.GetBindingExpression(TextBox.TextProperty)?.ParentBinding?.Path?.Path;`
`52`	`53`
`53`	`54`	`if(bindingPath != null)`
`54`	`55`	`{`
`55`	`56`	`TextBoxIsValidTaskCancelSources.Add(textBox, new CancellationTokenSource());`
`56`	`57`	`textBox.LostKeyboardFocus += PersistencePropertyBoundTextBox_KeyboardLostFocus;`
`57`		`- textBox.TextChanged += PersistencePropertyBoundTextBox_TextChanged;`
	`58`	`+ textBox.TextChanged += PropertyBoundTextBox_TextChanged;`
`58`	`59`	`}`
`59`	`60`	`}`
`60`	`61`
	`62`	`+ bindingPath = txtUserImageUrl.GetBindingExpression(TextBox.TextProperty)?.ParentBinding?.Path?.Path;`
	`63`	`+`
	`64`	`+ if (bindingPath != null)`
	`65`	`+ {`
	`66`	`+ TextBoxIsValidTaskCancelSources.Add(txtUserImageUrl, new CancellationTokenSource());`
	`67`	`+ txtUserImageUrl.LostKeyboardFocus += UserPropertyBoundTextBox_KeyboardLostFocus;`
	`68`	`+ txtUserImageUrl.TextChanged += PropertyBoundTextBox_TextChanged;`
	`69`	`+ }`
	`70`	`+`
`61`	`71`	`Loaded += OptionsPage_Loaded;`
`62`	`72`	`}`
`63`		`- private void PersistencePropertyBoundTextBox_TextChanged(object sender, TextChangedEventArgs e)`
	`73`	`+ private void PropertyBoundTextBox_TextChanged(object sender, TextChangedEventArgs e)`
`64`	`74`	`{`
`65`	`75`	`var textBox = (TextBox)sender;`
`66`	`76`	`var bindingPath = textBox.GetBindingExpression(TextBox.TextProperty).ParentBinding.Path.Path;`
`@@ -72,10 +82,15 @@ private void PersistencePropertyBoundTextBox_TextChanged(object sender, TextChan`
`72`	`82`	`private void PersistencePropertyBoundTextBox_KeyboardLostFocus(object sender, KeyboardFocusChangedEventArgs e)`
`73`	`83`	`{`
`74`	`84`	`var textBox = (TextBox)sender;`
`75`		`- ReEvaluateTextboxSetting(textBox);`
	`85`	`+ ReEvaluateTextboxSetting(textBox, TeamCodingPackage.Current.Settings.SharedSettings);`
	`86`	`+ }`
	`87`	`+ private void UserPropertyBoundTextBox_KeyboardLostFocus(object sender, KeyboardFocusChangedEventArgs e)`
	`88`	`+ {`
	`89`	`+ var textBox = (TextBox)sender;`
	`90`	`+ ReEvaluateTextboxSetting(textBox, TeamCodingPackage.Current.Settings.UserSettings);`
`76`	`91`	`}`
`77`	`92`
`78`		`- private void ReEvaluateTextboxSetting(TextBox textBox)`
	`93`	`+ private void ReEvaluateTextboxSetting(TextBox textBox, object settingsObject)`
`79`	`94`	`{`
`80`	`95`	`// Cancel any existing tasks to see if the new setting property is valid (since we're changing it anyway)`
`81`	`96`	`TextBoxIsValidTaskCancelSources[textBox].Cancel();`
`@@ -93,7 +108,7 @@ private void ReEvaluateTextboxSetting(TextBox textBox)`
`93`	`108`	`textBlock.Foreground = Brushes.Black;`
`94`	`109`	`textBlock.Text = "⏳";`
`95`	`110`	`textBlock.ToolTip = "Checking configuration value...";`
`96`		`- var settingProperty = (SettingProperty<string>)typeof(SharedSettings).GetField(bindingPath + "Property").GetValue(TeamCodingPackage.Current.Settings.SharedSettings);`
	`111`	`+ var settingProperty = (SettingProperty<string>)settingsObject.GetType().GetField(bindingPath + "Property", System.Reflection.BindingFlags.NonPublic \| System.Reflection.BindingFlags.Public \| System.Reflection.BindingFlags.Instance).GetValue(settingsObject);`
`97`	`112`
`98`	`113`	`// Add a new token to the dictionary to use with this task we're about to create`
`99`	`114`	`TextBoxIsValidTaskCancelSources[textBox] = new CancellationTokenSource();`
`@@ -137,16 +152,26 @@ private void OptionsPage_Loaded(object sender, RoutedEventArgs e)`
`137`	`152`
`138`	`153`	`chkUsingJsonSettings.IsChecked = loadedFromFile;`
`139`	`154`
	`155`	`+ string bindingPath;`
	`156`	`+`
`140`	`157`	`foreach (var textBox in grpPersistence.FindChildren<TextBox>())`
`141`	`158`	`{`
`142`		`- var bindingPath = textBox.GetBindingExpression(TextBox.TextProperty)?.ParentBinding?.Path?.Path;`
	`159`	`+ bindingPath = textBox.GetBindingExpression(TextBox.TextProperty)?.ParentBinding?.Path?.Path;`
`143`	`160`
`144`	`161`	`if (bindingPath != null)`
`145`	`162`	`{`
`146`	`163`	`textBox.GetBindingExpression(TextBox.TextProperty).UpdateTarget();`
`147`		`- ReEvaluateTextboxSetting(textBox);`
	`164`	`+ ReEvaluateTextboxSetting(textBox, TeamCodingPackage.Current.Settings.SharedSettings);`
`148`	`165`	`}`
`149`	`166`	`}`
	`167`	`+`
	`168`	`+ bindingPath = txtUserImageUrl.GetBindingExpression(TextBox.TextProperty)?.ParentBinding?.Path?.Path;`
	`169`	`+`
	`170`	`+ if (bindingPath != null)`
	`171`	`+ {`
	`172`	`+ txtUserImageUrl.GetBindingExpression(TextBox.TextProperty).UpdateTarget();`
	`173`	`+ ReEvaluateTextboxSetting(txtUserImageUrl, TeamCodingPackage.Current.Settings.UserSettings);`
	`174`	`+ }`
`150`	`175`	`}`
`151`	`176`	`private void Control_GotKeyboardFocus(object sender, KeyboardFocusChangedEventArgs e)`
`152`	`177`	`{`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public UserSettings()`
`48`	`48`	`UsernameProperty = new SettingProperty<string>(this);`
`49`	`49`	`UsernameProperty.Changed += (s, e) => TeamCodingPackage.Current.Logger.WriteInformation($"Changing setting {nameof(Username)}: {Username}");`
`50`	`50`
`51`		`- UserImageUrlProperty = new SettingProperty<string>(this);`
	`51`	`+ UserImageUrlProperty = new SettingProperty<string>(this, CheckUserImageUrl);`
`52`	`52`	`UserImageUrlProperty.Changed += (s, e) => TeamCodingPackage.Current.Logger.WriteInformation($"Changing setting {nameof(UserImageUrl)}: {UserImageUrl}");`
`53`	`53`
`54`	`54`	`UserCodeDisplayProperty = new SettingProperty<UserDisplaySetting>(this);`
`@@ -60,5 +60,11 @@ public UserSettings()`
`60`	`60`	`ShowAllBranchesProperty = new SettingProperty<bool>(this, null);`
`61`	`61`	`ShowAllBranchesProperty.Changed += (s, e) => TeamCodingPackage.Current.Logger.WriteInformation($"Changing setting {nameof(ShowAllBranches)}: {ShowAllBranches}");`
`62`	`62`	`}`
	`63`	`+`
	`64`	`+ private async Task<string> CheckUserImageUrl(string imageUrl)`
	`65`	`+ {`
	`66`	`+ var url = await TeamCodingPackage.Current.UserImages.GetImageFromUrl(imageUrl);`
	`67`	`+ return null;`
	`68`	`+ }`
`63`	`69`	`}`
`64`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`	`using Microsoft.VisualStudio.Shell;`
`13`	`13`	`using TeamCoding.Options;`
`14`	`14`	`using TeamCoding.VisualStudio.Controls;`
	`15`	`+using System.Threading.Tasks;`
`15`	`16`
`16`	`17`	`namespace TeamCoding.VisualStudio`
`17`	`18`	`{`
`@@ -113,10 +114,7 @@ private void SetImageSource(UserAvatarModel context, IUserIdentity userIdentity)`
`113`	`114`	`{`
`114`	`115`	`try`
`115`	`116`	`{`
`116`		`- var request = await TeamCodingPackage.Current.HttpClient.GetAsync(userIdentity.ImageUrl);`
`117`		`- if (!request.IsSuccessStatusCode) return;`
`118`		`- var imageStream = await request.Content.ReadAsStreamAsync();`
`119`		`- context.AvatarImageSource = UrlImages[userIdentity.ImageUrl] = BitmapFrame.Create(imageStream, BitmapCreateOptions.None, BitmapCacheOption.OnLoad);`
	`117`	`+ context.AvatarImageSource = await GetImageFromUrl(userIdentity.ImageUrl);`
`120`	`118`	`}`
`121`	`119`	`catch (Exception ex) when (!System.Diagnostics.Debugger.IsAttached)`
`122`	`120`	`{`
`@@ -131,6 +129,14 @@ private void SetImageSource(UserAvatarModel context, IUserIdentity userIdentity)`
`131`	`129`	`context.AvatarImageSource = null;`
`132`	`130`	`}`
`133`	`131`	`}`
	`132`	`+ public async Task<ImageSource> GetImageFromUrl(string url)`
	`133`	`+ {`
	`134`	`+ var request = await TeamCodingPackage.Current.HttpClient.GetAsync(url);`
	`135`	`+ request.EnsureSuccessStatusCode();`
	`136`	`+`
	`137`	`+ var imageStream = await request.Content.ReadAsStreamAsync();`
	`138`	`+ return UrlImages[url] = BitmapFrame.Create(imageStream, BitmapCreateOptions.None, BitmapCacheOption.OnLoad);`
	`139`	`+ }`
`134`	`140`	`/// <summary>`
`135`	`141`	`/// Sets properties specific to a user control in a document tab`
`136`	`142`	`/// </summary>`