Fix RightTapped Selection Bug

Author: lukeblevins

Files UWP/FilesUWP.csproj

@@ -17,14 +17,14 @@
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WindowsXamlEnableOverview>true</WindowsXamlEnableOverview>
-    <PackageCertificateKeyFile>Files_TemporaryKey.pfx</PackageCertificateKeyFile>
+    <PackageCertificateKeyFile>FilesUwp.Package_TemporaryKey.pfx</PackageCertificateKeyFile>
     <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
     <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
     <AppxBundlePlatforms>x86|x64|arm</AppxBundlePlatforms>
     <AppInstallerUpdateFrequency>1</AppInstallerUpdateFrequency>
     <AppInstallerCheckForUpdateFrequency>OnApplicationRun</AppInstallerCheckForUpdateFrequency>
     <AppxPackageDir>C:\Users\Luke\Documents\Packages\</AppxPackageDir>
-    <PackageCertificateThumbprint>28AE037A1F13461E0372E31085451A86570D5A1B</PackageCertificateThumbprint>
+    <PackageCertificateThumbprint>EDB926CA7770B2992722830C048F36DD5077691C</PackageCertificateThumbprint>
     <AppxBundle>Never</AppxBundle>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
@@ -154,11 +154,6 @@
       <DependentUpon>YourHome.xaml</DependentUpon>
     </Compile>
   </ItemGroup>
-  <ItemGroup>
-    <AppxManifest Include="Package.appxmanifest">
-      <SubType>Designer</SubType>
-    </AppxManifest>
-  </ItemGroup>
   <ItemGroup>
     <Content Include="Assets\abstract_HeroImage.jpg" />
     <Content Include="Assets\Cards\Gradients\Blue.png" />
@@ -251,14 +246,19 @@
       <Version>2.1.190405004.1</Version>
     </PackageReference>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="Files_TemporaryKey.pfx" />
-  </ItemGroup>
   <ItemGroup>
     <SDKReference Include="WindowsDesktop, Version=10.0.18362.0">
       <Name>Windows Desktop Extensions for the UWP</Name>
     </SDKReference>
   </ItemGroup>
+  <ItemGroup>
+    <AppxManifest Include="Package.appxmanifest">
+      <SubType>Designer</SubType>
+    </AppxManifest>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="FilesUwp.Package_TemporaryKey.pfx" />
+  </ItemGroup>
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
     <VisualStudioVersion>14.0</VisualStudioVersion>
   </PropertyGroup>

Files UWP/Interacts/Interaction.cs

@@ -325,19 +325,18 @@ public static void AllView_RightTapped(object sender, RightTappedRoutedEventArgs
         {
             dataGrid = (DataGrid)sender;
             var RowPressed = FindParent<DataGridRow>(e.OriginalSource as DependencyObject);
-            // If user clicks on header
-            if (RowPressed == null)
+            var ObjectPressed = ((ReadOnlyObservableCollection<ListedItem>)dataGrid.ItemsSource)[RowPressed.GetIndex()];
+            // Check if RightTapped row is currently selected
+            foreach (ListedItem listedItem in GenericFileBrowser.data.SelectedItems)
             {
-                GenericFileBrowser.HeaderContextMenu.ShowAt(dataGrid, e.GetPosition(dataGrid));
-            }
-            // If user clicks on actual row
-            else
-            {
-                var ObjectPressed = ((ReadOnlyObservableCollection<ListedItem>)dataGrid.ItemsSource)[RowPressed.GetIndex()];
-                dataGrid.SelectedItems.Add(ObjectPressed);
-                GenericFileBrowser.context.ShowAt(dataGrid, e.GetPosition(dataGrid));
+                if (RowPressed.GetIndex() == listedItem.RowIndex)
+                {
+                    return;
+                }
             }
-
+            // The following code is only reachable when a user RightTapped an unselected row
+            dataGrid.SelectedItems.Clear();
+            dataGrid.SelectedItems.Add(ObjectPressed);
         }
 
         public static void FindChildren<T>(List<T> results, DependencyObject startNode) where T : DependencyObject

FilesUwp.Package/FilesUwp.Package.wapproj

@@ -40,7 +40,7 @@
     <DefaultLanguage>en-US</DefaultLanguage>
     <PackageCertificateKeyFile>FilesUwp.Package_TemporaryKey.pfx</PackageCertificateKeyFile>
     <EntryPointProjectUniqueName>..\Files UWP\FilesUWP.csproj</EntryPointProjectUniqueName>
-    <PackageCertificateThumbprint>D90FDFED5D096AAD472FE13BA80DBFD16C25914E</PackageCertificateThumbprint>
+    <PackageCertificateThumbprint>EDB926CA7770B2992722830C048F36DD5077691C</PackageCertificateThumbprint>
     <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
     <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
     <AppInstallerUpdateFrequency>1</AppInstallerUpdateFrequency>
@@ -69,10 +69,6 @@
     <AppxManifest Include="Package.appxmanifest">
       <SubType>Designer</SubType>
     </AppxManifest>
-    <None Include="FilesUwp.Package_TemporaryKey.pfx" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Files_TemporaryKey.pfx" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ExecutableLauncher\ExecutableLauncher.csproj">
@@ -134,6 +130,7 @@
     <Content Include="Assets\Wide310x150Logo.scale-150.png" />
     <Content Include="Assets\Wide310x150Logo.scale-200.png" />
     <Content Include="Assets\Wide310x150Logo.scale-400.png" />
+    <None Include="FilesUwp.Package_TemporaryKey.pfx" />
   </ItemGroup>
   <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" />
 </Project>