Merge pull request #10 from Microsoft/users/markAtMicrosoft/Variables…

…NotUsed Remove some compiler warnings, update Installation instructions and e…
microsoft · May 25, 2018 · 4a5e4db · 4a5e4db
2 parents c244ca2 + 86a9d63
commit 4a5e4db
Show file tree

Hide file tree

Showing 13 changed files with 82 additions and 53 deletions.
diff --git a/Installation.md b/Installation.md
@@ -43,6 +43,9 @@ Use the following steps to create your LUIS App and retrieve an App ID
 - Copy the **Application ID** shown and paste into the LUIS App Id field in Settings for Snip Insights-  
 
 You can now paste each key in the settings panel of the application.
+Remember to Click the **Save** button after entering all the keys.
+
+> **NOTE** For each key entered there is a corresponding Service Endpoint.  There are some default endpoints included (You can use as an example) but when you copy each key, also check and replace the Service Endpoint for each service you are using.  You will find the service endpoint for each Cognitive Service on the Overview Page.  Remember to Click the **Save** button after updating all the Service Endpoints.
 
 Congratulations! You should now have a fully working application to get started. Have fun testing the project and thank you for your contribution! 
 

diff --git a/SnipInsight/AIServices/AILogic/TranslationHandler.cs b/SnipInsight/AIServices/AILogic/TranslationHandler.cs
@@ -83,7 +83,7 @@ public async Task<string> GetResult(string textToTranslate, string fromLanguage,
 
             try
             {
-                WebResponse response = webRequest.GetResponse();
+                WebResponse response = await webRequest.GetResponseAsync();
 
                 using (StreamReader translatedStream = new StreamReader(response.GetResponseStream(), Encoding.GetEncoding("utf-8")))
                 {
@@ -113,7 +113,7 @@ private async Task GetLanguagesForTranslate()
             WebRequest request = WebRequest.Create(URI);
             request.Headers.Add("Ocp-Apim-Subscription-Key", this.Key);
 
-            WebResponse response = request.GetResponse();
+            WebResponse response = await request.GetResponseAsync();
 
             using (Stream stream = response.GetResponseStream())
             {
@@ -143,7 +143,7 @@ private async Task GetLanguageNames()
             }
 
             // Read and parse the XML response
-            var response = request.GetResponse();
+            var response = await request.GetResponseAsync();
 
             string[] languageNames;
             using (Stream stream = response.GetResponseStream())

diff --git a/SnipInsight/AIServices/AIViewModels/ImageAnalysisViewModel.cs b/SnipInsight/AIServices/AIViewModels/ImageAnalysisViewModel.cs
@@ -123,7 +123,7 @@ private void NavigateToCelebrityUrlCommandExecute()
             {
                 Process.Start(Celebrity.URL);
             }
-            catch (Win32Exception e)
+            catch (Win32Exception)
             {
                 MessageBox.Show(Resources.No_Browser);
             }
@@ -138,7 +138,7 @@ private void NavigateToLandmarkUrlCommandExecute()
             {
                 Process.Start(Landmarks[0].URL);
             }
-            catch (Win32Exception e)
+            catch (Win32Exception)
             {
                 MessageBox.Show(Resources.No_Browser);
             }
@@ -153,7 +153,7 @@ private void NavigateToNewsUrlCommandExecute(NewsModel newsModel)
             {
                 Process.Start(newsModel.URL);
             }
-            catch (Win32Exception e)
+            catch (Win32Exception)
             {
                 MessageBox.Show(Resources.No_Browser);
             }

diff --git a/SnipInsight/AIServices/AIViewModels/InsightsPermissionsViewModel.cs b/SnipInsight/AIServices/AIViewModels/InsightsPermissionsViewModel.cs
@@ -74,7 +74,7 @@ private void GoToUrl(string url)
             {
                 Process.Start(url);
             }
-            catch (Win32Exception CaughtExeception)
+            catch (Win32Exception)
             {
                 MessageBox.Show(Resources.No_Browser);
             }

diff --git a/SnipInsight/AIServices/AIViewModels/OCRViewModel.cs b/SnipInsight/AIServices/AIViewModels/OCRViewModel.cs
@@ -334,7 +334,7 @@ private void CompareResult(HandWrittenModel writtenModel, PrintedModel printedMo
                     result.Append(line.Text + "\n");
                 }
             }
-            catch (Exception e)
+            catch (Exception)
             { }
 
             string writtenResult = result.ToString() ?? string.Empty;
@@ -356,7 +356,7 @@ private void CompareResult(HandWrittenModel writtenModel, PrintedModel printedMo
                     }
                 }
             }
-            catch (Exception e)
+            catch (Exception)
             { }
 
             printedResult = result.ToString() ?? string.Empty;

diff --git a/SnipInsight/AppManager.cs b/SnipInsight/AppManager.cs
@@ -151,7 +151,7 @@ internal FirstRunWindow FirstRunWindow
                 { ActionNames.ShareSendToOneNoteWithImage, WrapException(OnShareSendToOneNoteWithImage)},
                 { ActionNames.CopyWithImage, WrapException(OnCopyWithImage)},
                 { ActionNames.ClearOldImageData, WrapException(ClearOldImageData)},
-                { ActionNames.Delete, WrapAsyncException(OnDelete)},
+                { ActionNames.Delete, WrapException(OnDelete)},
                 { ActionNames.DeleteLibraryItems, WrapAsyncException(OnDeleteLibraryItems)},
                 { ActionNames.CleanFiles, WrapException(OnCleanFiles)},
                 { ActionNames.ShowImageCapturedToastMessage, WrapException(ShowImageCapturedToastMessage)},
@@ -853,9 +853,9 @@ internal void OnExit()
             }
         }
 
-        private async Task OnDelete()
+        private void OnDelete()
         {
-            await Delete(ViewModel.SavedSnipInsightFile, ViewModel.SavedCaptureImage, ViewModel.SavedInkedImage, true);
+            Delete(ViewModel.SavedSnipInsightFile, ViewModel.SavedCaptureImage, ViewModel.SavedInkedImage, true);
         }
 
         private async Task OnDeleteLibraryItems()
@@ -868,7 +868,7 @@ public Task DeleteLibraryItemsAsync()
             return DeleteAsync(ViewModel.SelectedLibraryItems, true, false);
         }
 
-        async public Task Delete(string SnipInsightFile, string savedCaptureImage, string savedInkedImage, bool raiseOutcomeTrigger)
+         public void Delete(string SnipInsightFile, string savedCaptureImage, string savedInkedImage, bool raiseOutcomeTrigger)
         {
             try
             {
@@ -887,7 +887,7 @@ async public Task Delete(string SnipInsightFile, string savedCaptureImage, strin
                     return;
                 }
 
-                var success = await DeleteCore(SnipInsightFile, savedCaptureImage, savedInkedImage);
+                var success = DeleteCore(SnipInsightFile, savedCaptureImage, savedInkedImage);
 
                 if (success)
                 {
@@ -982,7 +982,7 @@ public async Task DeleteAsync(IEnumerable<SnipInsightLink> items, bool showConfi
                 {
                     var deletedIndex = GetCurrentContentIndexInLibrary(item);
 
-                    var success = await DeleteCore(item);
+                    var success = DeleteCore(item);
 
                     processedCount++;
 
@@ -1355,7 +1355,7 @@ void OnCleanFiles()
         }
 
 
-        public Task<bool> DeleteCore(SnipInsightLink SnipInsight)
+        public bool DeleteCore(SnipInsightLink SnipInsight)
         {
             bool isPackage = Path.GetExtension(SnipInsight.Url) == ".mixp";
 
@@ -1375,7 +1375,7 @@ public Task<bool> DeleteCore(SnipInsightLink SnipInsight)
         /// Delete files core.
         /// </summary>
         /// <returns></returns>
-        public async Task<bool> DeleteCore(string SnipInsightFile, string savedCaptureImage, string savedInkedImage)
+        public bool DeleteCore(string SnipInsightFile, string savedCaptureImage, string savedInkedImage)
         {
             // delete the captured image.
             if (!string.IsNullOrWhiteSpace(savedCaptureImage))
@@ -2052,7 +2052,7 @@ public class OperationResult
         }
 
         #region Share
-        async Task Publish(Action<OperationResult> continueWith, string failureMessageForToast, bool embedCodeNeeded = false)
+        void Publish(Action<OperationResult> continueWith, string failureMessageForToast, bool embedCodeNeeded = false)
         {
             if (continueWith == null)
             {

diff --git a/SnipInsight/ResourceDictionaries/SnipStyles.xaml b/SnipInsight/ResourceDictionaries/SnipStyles.xaml
@@ -1106,7 +1106,7 @@
         <Setter Property="BorderThickness" Value="2" />
         <Setter Property="BorderBrush" Value="LightGray" />
         <Setter Property="Height" Value="Auto" />
-        <Setter Property="MaxLength" Value="50" />
+        <Setter Property="MaxLength" Value="255" />
         <Setter Property="HorizontalAlignment" Value="Stretch"/>
         <Setter Property="HorizontalContentAlignment" Value="Stretch"></Setter>
         <Setter Property="TextWrapping" Value="NoWrap" />

diff --git a/SnipInsight/SnipInsight.csproj b/SnipInsight/SnipInsight.csproj
@@ -13,6 +13,7 @@
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>
     <TargetFrameworkProfile />
+	<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>

diff --git a/SnipInsight/Util/AppUsageLogger.cs b/SnipInsight/Util/AppUsageLogger.cs
@@ -33,7 +33,6 @@ internal AppUsageLogger(string langName, string appName, string appVersion, stri
             _os = string.Format("{0} ({1})", envOS, osBitness);
             _process = processBitness;
             _itInstall = itInstall;
-            _entryId = 0;
 
             const int UploadDelay = 29567;
             const int IdleThreshold = 5107;
@@ -183,7 +182,6 @@ private void UploadSuccessCallback()
         private string _langName;
         private string _uploadLogFile;
         private string _sessionId;
-        private int _entryId;
         private object _lock;
         private DateTime _lastLogged;
         private LogUploader _logUploader;

diff --git a/SnipInsight/Views/EditorSideNavigation.xaml.cs b/SnipInsight/Views/EditorSideNavigation.xaml.cs
@@ -22,8 +22,6 @@ public partial class EditorSideNavigation : UserControl
         /// <summary>
         /// Defines if the pen was already checked
         /// </summary>
-        private bool isPenChecked = false;
-
         public EditorSideNavigation()
         {
             InitializeComponent();

diff --git a/SnipInsight/Views/SettingsPanel.xaml b/SnipInsight/Views/SettingsPanel.xaml
@@ -97,8 +97,19 @@
                 Visibility="{Binding InsightsVisible, Converter={StaticResource BooleanToVisibility}}"
                              AutomationProperties.Name="Api Keys">
                 <Separator Margin="15"/>
-                <TextBlock Style="{DynamicResource SettingsTitleStyle}"
-                       Text="Insight Service Keys" AutomationProperties.Name="InsightServiceKeysSubPanel"/>
+                <StackPanel Orientation="Horizontal">
+                    <TextBlock Style="{DynamicResource SettingsTitleStyle}"
+                               Text="Insight Service Keys" AutomationProperties.Name="InsightServiceKeysSubPanel"/>
+                    <Button Style="{DynamicResource SettingsPanelButton}"
+                            x:Name="UpdateButtonKeys"
+                            VerticalAlignment="Center"
+                            AutomationProperties.Name="SettingsPanelButton"
+                            ToolTip="{x:Static properties:Resources.UpdateKeys}"
+                            Margin="24,8,0,8"
+                            Click="UpdateAllKeys">
+                        Save
+                    </Button>
+                </StackPanel>
                 <Grid>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="Auto"/>
@@ -125,7 +136,7 @@
                     </TextBlock>
                     <TextBox Grid.Row="0" Grid.Column="1" Name="EntitySearch"
                              Style="{DynamicResource SettingsTextBoxStyle}"
-                             AutomationProperties.Name="EntitySearchKeyTextbox">
+                             AutomationProperties.Name="EntitySearchKeyTextbox" TextChanged="Key_OnTextChanged">
                     </TextBox>
                     <TextBlock Grid.Row="1" Grid.Column="0">
                         <Hyperlink RequestNavigate="Open_HyperLink"
@@ -138,7 +149,7 @@
                         </TextBlock>
                     <TextBox Grid.Row="1" Grid.Column="1" Name="ImageAnalysis"
                          Style="{DynamicResource SettingsTextBoxStyle}"
-                         AutomationProperties.Name="ImageAnalysisKeyTextbox">
+                         AutomationProperties.Name="ImageAnalysisKeyTextbox" TextChanged="Key_OnTextChanged">
                     </TextBox>
                     <TextBlock Grid.Row="2"
                                Grid.Column="0">
@@ -154,7 +165,7 @@
                              Grid.Column="1"
                              Name="ImageSearch"
                          Style="{DynamicResource SettingsTextBoxStyle}"
-                         AutomationProperties.Name="ImageSearchKeyTextbox">
+                         AutomationProperties.Name="ImageSearchKeyTextbox" TextChanged="Key_OnTextChanged">
                     </TextBox>
                     <TextBlock Grid.Row="3"
                                Grid.Column="0">
@@ -168,7 +179,7 @@
                     </TextBlock>
                     <TextBox Grid.Row="3" Grid.Column="1" Name="TextRecognition"
                          Style="{DynamicResource SettingsTextBoxStyle}"
-                         AutomationProperties.Name="TextRecognitionKeyTextbox">
+                         AutomationProperties.Name="TextRecognitionKeyTextbox" TextChanged="Key_OnTextChanged">
                     </TextBox>
                     <TextBlock Grid.Row="4"
                                Grid.Column="0">
@@ -184,7 +195,7 @@
                              Grid.Column="1" 
                              Name="Translator"
                          Style="{DynamicResource SettingsTextBoxStyle}"
-                         AutomationProperties.Name="TranslatorKeyTextbox">
+                         AutomationProperties.Name="TranslatorKeyTextbox" TextChanged="Key_OnTextChanged">
                     </TextBox>
                     <TextBlock Grid.Row="5"
                                Grid.Column="0">
@@ -200,7 +211,7 @@
                              Grid.Column="1"
                              Name="ContentModerator"
                          Style="{DynamicResource SettingsTextBoxStyle}"
-                         AutomationProperties.Name="ContentModeratorKeyTextbox">
+                         AutomationProperties.Name="ContentModeratorKeyTextbox" TextChanged="Key_OnTextChanged">
                     </TextBox>
                     <TextBlock Grid.Row="6" Grid.Column="0">
                         <Hyperlink RequestNavigate="Open_HyperLink"
@@ -215,7 +226,7 @@
                              Grid.Column="1"
                              Name="LUISKey"
                          Style="{DynamicResource SettingsTextBoxStyle}"
-                         AutomationProperties.Name="LUIS Key Textbox">
+                         AutomationProperties.Name="LUIS Key Textbox" TextChanged="Key_OnTextChanged">
                     </TextBox>
                     <TextBlock Grid.Row="7"
                                Grid.Column="0">
@@ -229,11 +240,22 @@
                     </TextBlock>
                     <TextBox Grid.Row="7" Grid.Column="1" Name="LUISAppId"
                          Style="{DynamicResource SettingsTextBoxStyle}"
-                         AutomationProperties.Name="LUISAppIdTextbox">
+                         AutomationProperties.Name="LUISAppIdTextbox" TextChanged="Key_OnTextChanged">
                     </TextBox>
                 </Grid>
-                <TextBlock Style="{DynamicResource SettingsTitleStyle}"
-                       Text="Insight Service Endpoints" AutomationProperties.Name="InsightServiceEndpointsSubPanel"/>
+                <StackPanel Orientation="Horizontal">
+                    <TextBlock Style="{DynamicResource SettingsTitleStyle}" VerticalAlignment="Center"
+                           Text="Insight Service Endpoints" AutomationProperties.Name="InsightServiceEndpointsSubPanel"/>
+                    <Button Style="{DynamicResource SettingsPanelButton}"
+                            x:Name="UpdateButton"
+                            VerticalAlignment="Center"
+                            AutomationProperties.Name="SettingsPanelButton"
+                            ToolTip="{x:Static properties:Resources.UpdateKeys}"
+                            Margin="24,8,0,8"
+                            Click="UpdateAllKeys">
+                        Save
+                    </Button>
+                </StackPanel>
                 <Grid>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="Auto"/>
@@ -260,7 +282,7 @@
                     </TextBlock>
                     <TextBox Grid.Row="0" Grid.Column="1" Name="EntitySearchEndpoint"
                              Style="{DynamicResource SettingsTextBoxStyle}"
-                             AutomationProperties.Name="EntitySearchKeyTextbox">
+                             AutomationProperties.Name="EntitySearchKeyTextbox" TextChanged="Key_OnTextChanged">
                     </TextBox>
                     <TextBlock Grid.Row="1" Grid.Column="0">
                         <Hyperlink RequestNavigate="Open_HyperLink"
@@ -273,7 +295,7 @@
                         </TextBlock>
                     <TextBox Grid.Row="1" Grid.Column="1" Name="ImageAnalysisEndpoint"
                          Style="{DynamicResource SettingsTextBoxStyle}"
-                         AutomationProperties.Name="ImageAnalysisKeyTextbox">
+                         AutomationProperties.Name="ImageAnalysisKeyTextbox" TextChanged="Key_OnTextChanged">
                     </TextBox>
                     <TextBlock Grid.Row="2"
                                Grid.Column="0">
@@ -289,7 +311,7 @@
                              Grid.Column="1"
                              Name="ImageSearchEndpoint"
                          Style="{DynamicResource SettingsTextBoxStyle}"
-                         AutomationProperties.Name="ImageSearchKeyTextbox">
+                         AutomationProperties.Name="ImageSearchKeyTextbox" TextChanged="Key_OnTextChanged">
                     </TextBox>
                     <TextBlock Grid.Row="3"
                                Grid.Column="0">
@@ -303,7 +325,7 @@
                     </TextBlock>
                     <TextBox Grid.Row="3" Grid.Column="1" Name="TextRecognitionEndpoint"
                          Style="{DynamicResource SettingsTextBoxStyle}"
-                         AutomationProperties.Name="TextRecognitionKeyTextbox">
+                         AutomationProperties.Name="TextRecognitionKeyTextbox" TextChanged="Key_OnTextChanged">
                     </TextBox>
                     <TextBlock Grid.Row="4"
                                Grid.Column="0">
@@ -319,7 +341,7 @@
                              Grid.Column="1" 
                              Name="TranslatorEndpoint"
                          Style="{DynamicResource SettingsTextBoxStyle}"
-                         AutomationProperties.Name="TranslatorKeyTextbox">
+                         AutomationProperties.Name="TranslatorKeyTextbox" TextChanged="Key_OnTextChanged">
                     </TextBox>
                     <TextBlock Grid.Row="5"
                                Grid.Column="0">
@@ -335,7 +357,7 @@
                              Grid.Column="1"
                              Name="ContentModeratorEndpoint"
                          Style="{DynamicResource SettingsTextBoxStyle}"
-                         AutomationProperties.Name="ContentModeratorKeyTextbox">
+                         AutomationProperties.Name="ContentModeratorKeyTextbox" TextChanged="Key_OnTextChanged">
                     </TextBox>
                     <TextBlock Grid.Row="6" Grid.Column="0">
                         <Hyperlink RequestNavigate="Open_HyperLink"
@@ -350,7 +372,7 @@
                              Grid.Column="1"
                              Name="LUISKeyEndpoint"
                          Style="{DynamicResource SettingsTextBoxStyle}"
-                         AutomationProperties.Name="LUIS Key Textbox">
+                         AutomationProperties.Name="LUIS Key Textbox" TextChanged="Key_OnTextChanged">
                     </TextBox>
                     <!--<TextBlock Grid.Row="7"
                                Grid.Column="0">
@@ -368,15 +390,6 @@
                     </TextBox>-->
                 </Grid>
 
-                <Button Style="{DynamicResource SettingsPanelButton}"
-                        Grid.Row="1"
-                        Grid.Column="1"
-                        AutomationProperties.Name="SettingsPanelButton"
-                        ToolTip="{x:Static properties:Resources.UpdateKeys}"
-                        Margin="0,10,0,0"
-                        Click="UpdateAllKeys">
-                    Update
-                </Button>
             </StackPanel>
 
             <Separator Margin="15"/>