Bugfix ReadWriteKey Mismatch UI

fix: Read/Write Key in Desfire was located on the wrong tab
c3rebro · Jul 8, 2022 · b115fed · b115fed
1 parent e462d2c
commit b115fed
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 9 deletions.
diff --git a/RFiDGear/DataAccessLayer/Remote/FromIO/RFiDDevice.cs b/RFiDGear/DataAccessLayer/Remote/FromIO/RFiDDevice.cs
@@ -729,7 +729,7 @@ public ERROR WriteMiFareClassicWithMAD(int _madApplicationID, int _madStartSecto
 
 
 							var cmd = card.Commands as IMifareCommands;
-							var cardService = card.GetService(CardServiceType.CST_STORAGE) as IStorageCardService;
+							var cardService = card.GetService(LibLogicalAccess.CardServiceType.CST_STORAGE) as IStorageCardService;
 
 							try
 							{

diff --git a/RFiDGear/RFiDGear.csproj b/RFiDGear/RFiDGear.csproj
@@ -26,6 +26,21 @@
     <ApplicationIcon>Resources\logo.ico</ApplicationIcon>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -367,5 +382,17 @@
   <ItemGroup>
     <Resource Include="Resources\splash.png" />
   </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.7.2">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4.7.2 %28x86 und x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
diff --git a/RFiDGear/RFiDGear.csproj.user b/RFiDGear/RFiDGear.csproj.user
@@ -4,4 +4,14 @@
     <StartArguments>"D:\Seafile\Dokumente Privat\Steven\Projekte\Software\Windows\RFIDGear\zipped.rfPrj"</StartArguments>
     <StartWorkingDirectory>D:\Seafile\Dokumente Privat\Steven\Projekte\Software\Windows\RFIDGear\RFiDGear\bin\Debug\</StartWorkingDirectory>
   </PropertyGroup>
+  <PropertyGroup>
+    <PublishUrlHistory />
+    <InstallUrlHistory />
+    <SupportUrlHistory />
+    <UpdateUrlHistory />
+    <BootstrapperUrlHistory />
+    <ErrorReportUrlHistory />
+    <FallbackCulture>de-DE</FallbackCulture>
+    <VerifyUploadedFiles>false</VerifyUploadedFiles>
+  </PropertyGroup>
 </Project>
diff --git a/RFiDGear/ViewModel/TaskSetupViewModels/MifareDesfireSetupViewModel.cs b/RFiDGear/ViewModel/TaskSetupViewModels/MifareDesfireSetupViewModel.cs
@@ -1882,9 +1882,9 @@ private void OnNewReadDataCommand()
 				         			if (CustomConverter.FormatMifareDesfireKeyStringWithSpacesEachByte(DesfireAppKeyCurrent) == KEY_ERROR.NO_ERROR)
 				         			{
 										 ERROR result = device.AuthToMifareDesfireApplication(
-												 DesfireAppKeyCurrent,
-												 SelectedDesfireMasterKeyEncryptionTypeCurrent,
-												 selectedDesfireAppKeyNumberCurrentAsInt, AppNumberCurrentAsInt);
+												 DesfireReadKeyCurrent,
+												 SelectedDesfireReadKeyEncryptionType,
+												 selectedDesfireReadKeyNumberAsInt, AppNumberCurrentAsInt);
 
 
 										if (IsValidAppNumberNew != false && result == ERROR.NoError)
@@ -2010,12 +2010,12 @@ private void OnNewWriteDataCommand()
 								 if (CustomConverter.FormatMifareDesfireKeyStringWithSpacesEachByte(DesfireAppKeyCurrent) == KEY_ERROR.NO_ERROR)
 								 {
 
-									 ERROR result = device.AuthToMifareDesfireApplication(
-											  DesfireAppKeyCurrent,
-											  SelectedDesfireMasterKeyEncryptionTypeCurrent,
-											  selectedDesfireAppKeyNumberCurrentAsInt, AppNumberCurrentAsInt);
+										 ERROR result = device.AuthToMifareDesfireApplication(
+																						  DesfireWriteKeyCurrent,
+																						  SelectedDesfireWriteKeyEncryptionType,
+																						  selectedDesfireWriteKeyNumberAsInt, AppNumberCurrentAsInt);
 
-									 if (IsValidAppNumberNew != false && result == ERROR.NoError)
+										 if (IsValidAppNumberNew != false && result == ERROR.NoError)
 									 {
 										 StatusText += string.Format("{0}: Successfully Authenticated to App {1}\n", DateTime.Now, AppNumberCurrentAsInt);
 

diff --git a/RFiDGear/packages.config b/RFiDGear/packages.config
@@ -6,6 +6,7 @@
   <package id="DotNetZip.Reduced" version="1.9.1.8" targetFramework="net452" />
   <package id="Ionic.Zip-1.9.1.8" version="1.9.1.8" targetFramework="net472" />
   <package id="itext7" version="7.1.17" targetFramework="net472" />
+  <package id="LibLogicalAccessNetCE" version="2.4.0" targetFramework="net472" />
   <package id="Microsoft.CSharp" version="4.7.0" targetFramework="net461" />
   <package id="MvvmLightLibs" version="5.4.1.1" targetFramework="net461" />
   <package id="Portable.BouncyCastle" version="1.9.0" targetFramework="net472" />

diff --git a/Setup/Product.wxs b/Setup/Product.wxs
@@ -186,6 +186,12 @@
             <Component Id="ByteArrayDll" Guid="0907B24F-F549-41D5-8222-645C550BB7E7" DiskId="1">
               <File Id="ByteArray.dll" Name="ByteArray.dll" Source="..\RFiDGear\bin\Release\ByteArray.dll" KeyPath="yes" />
             </Component>
+            <Component Id="CommonLoggingDll" Guid="5CA5CB50-8EA8-4EBF-AA40-6BC990B61AC7" DiskId="1">
+              <File Id="Common.Logging.dll" Name="Common.Logging.dll" Source="..\RFiDGear\bin\Release\Common.Logging.dll" KeyPath="yes" />
+            </Component>
+            <Component Id="CommonLoggingCoreDll" Guid="5CA5CB50-8EA8-4EBF-AA40-6BC120B6FEC7" DiskId="1">
+              <File Id="Common.Logging.Core.dll" Name="Common.Logging.Core.dll" Source="..\RFiDGear\bin\Release\Common.Logging.Core.dll" KeyPath="yes" />
+            </Component>
             <Component Id="CommonServiceLocatorDll" Guid="5CA5CB50-8EA8-4EBF-AA40-6BC120B61AC7" DiskId="1">
               <File Id="CommonServiceLocator.dll" Name="CommonServiceLocator.dll" Source="..\RFiDGear\bin\Release\CommonServiceLocator.dll" KeyPath="yes" />
             </Component>
@@ -332,6 +338,8 @@
 			<Feature Id="MainProgram" Title="!(loc.FeatureMainProgramTitle)" Description="!(loc.FeatureMainProgramDescription)" Level="1">
         <ComponentRef Id="BouncyCastleCryptoDll"/>
         <ComponentRef Id="ByteArrayDll"/>
+        <ComponentRef Id="CommonLoggingDll" />
+        <ComponentRef Id="CommonLoggingCoreDll" />
         <ComponentRef Id="CommonServiceLocatorDll" />
         <ComponentRef Id="ElatecNetDll"/>
 				<ComponentRef Id="GalaSoftMvvmLightExtrasDll" />
-Original file line number
+Diff line change
@@ Expand Up @@
     							var cmd = card.Commands as IMifareCommands;
-    							var cardService = card.GetService(CardServiceType.CST_STORAGE) as IStorageCardService;
+    							var cardService = card.GetService(LibLogicalAccess.CardServiceType.CST_STORAGE) as IStorageCardService;
     							try
     							{
@@ Expand Down @@