From d707038b4be79cbdd40c86448f2dbdb768c83c98 Mon Sep 17 00:00:00 2001
From: Steven <mail@shansen-online.de>
Date: Sat, 23 Jul 2022 23:09:35 +0200
Subject: [PATCH] Version 0.1.8239: Improvements

- Improvement: 	remove '-' character when copy/paste data as "Hex"-String
- Improvement:	Closing "Update Dialog" without using "Cancel Button" does no
				longer minimize mainWindow
- Improvement: 	changed "application id" to application code and
				function cluster code according to NXP AN10787 (MAD)
- Improvement:	RunTask as ContextMenuItem
---
 .../RedCell.Diagnostics.Update/Updater.cs     |  30 ++---
 .../Remote/FromFile/SettingsReaderWriter.cs   |   8 +-
 RFiDGear/Resources/Manifest.de.resx           |   3 +
 RFiDGear/Resources/Manifest.en.resx           |   3 +
 .../TabPageMifareClassicDataExplorerView.xaml |   1 +
 .../TabPageMifareClassicKeySetupView.xaml     |  79 ++++++++----
 .../RFiDChipGrandChildLayerViewModel.cs       |   2 +-
 RFiDGear/ViewModel/MainWindowViewModel.cs     |  14 +-
 .../MifareClassicSetupViewModel.cs            | 122 ++++++++++++++----
 9 files changed, 188 insertions(+), 74 deletions(-)

diff --git a/RFiDGear/3rdParty/RedCell/RedCell.Diagnostics.Update/Updater.cs b/RFiDGear/3rdParty/RedCell/RedCell.Diagnostics.Update/Updater.cs
index fc55fb5..e0fed6e 100644
--- a/RFiDGear/3rdParty/RedCell/RedCell.Diagnostics.Update/Updater.cs
+++ b/RFiDGear/3rdParty/RedCell/RedCell.Diagnostics.Update/Updater.cs
@@ -95,9 +95,8 @@ public Updater(FileInfo configFile)
 
             catch (Exception e)
             {
-                LogWriter.CreateLogEntry(string.Format("{0}\n{1}", e.Message, e.InnerException != null ? e.InnerException.Message : ""));
+                LogWriter.CreateLogEntry(string.Format("{0}: {1}; {2}", DateTime.Now, e.Message, e.InnerException != null ? e.InnerException.Message : ""));
             }
-            //LogWriter.CreateLogEntry(string.Format("{0}\n{1}",e.Message, e.InnerException != null ? e.InnerException.Message : ""));
         }
         #endregion
 
@@ -183,7 +182,7 @@ private void Check(object state)
 
                 catch (Exception e)
                 {
-                    LogWriter.CreateLogEntry(string.Format("{0}\n{1}", e.Message, e.InnerException != null ? e.InnerException.Message : ""));
+                    LogWriter.CreateLogEntry(string.Format("{0}: {1}; {2}", DateTime.Now, e.Message, e.InnerException != null ? e.InnerException.Message : ""));
                     _remoteConfig = null;
                     return;
                 }
@@ -191,7 +190,6 @@ private void Check(object state)
                 string data = Encoding.UTF8.GetString(http.ResponseData);
                 _remoteConfig = new Manifest(data);
 
-                //string.Format("{0}{1}",this._localConfig.RemoteConfigUri,settings.DefaultLanguage == "german" ? "/de-de" : "/en-us")
                 if (_remoteConfig == null)
                 {
                     return;
@@ -199,27 +197,25 @@ private void Check(object state)
 
                 if (_localConfig.SecurityToken != _remoteConfig.SecurityToken)
                 {
-                    Log.Write("Security token mismatch.");
+                    LogWriter.CreateLogEntry(string.Format("{0}: {1}", DateTime.Now, "Security token mismatch."));
                     return;
                 }
-                Log.Write("Remote config is valid.");
-                Log.Write("Local version is  {0}.", _localConfig.Version);
-                Log.Write("Remote version is {0}.", _remoteConfig.Version);
+                LogWriter.CreateLogEntry(string.Format("{0}: {1}", DateTime.Now, "Remote config is valid.")); Log.Write("Remote config is valid.");
+                LogWriter.CreateLogEntry(string.Format("{0}: {1}, {2}", DateTime.Now, "Local version is ", _localConfig.Version));
+                LogWriter.CreateLogEntry(string.Format("{0}: {1}, {2}", DateTime.Now, "Remote version is ", _remoteConfig.Version));
 
                 if (_remoteConfig.Version == _localConfig.Version)
                 {
-                    Log.Write("Versions are the same.");
-                    Log.Write("Check ending.");
+                    LogWriter.CreateLogEntry(string.Format("{0}: {1}", DateTime.Now, "Versions are the same. Check ending."));
                     return;
                 }
                 if (_remoteConfig.Version < _localConfig.Version)
                 {
-                    Log.Write("Remote version is older. That's weird.");
-                    Log.Write("Check ending.");
+                    LogWriter.CreateLogEntry(string.Format("{0}: {1}", DateTime.Now, "Remote version is older. That's weird. Check ending."));
                     return;
                 }
 
-                Log.Write("Remote version is newer. Updating.");
+                LogWriter.CreateLogEntry(string.Format("{0}: {1}", DateTime.Now, "Remote version is newer. Updating."));
                 _timer.Change(0, 1000);
 
                 if (!AllowUpdate && !IsUserNotified)
@@ -257,7 +253,7 @@ public void Update()
                 try { Directory.Delete(Path.Combine(appDataPath, WorkPath), true); }
                 catch (IOException e)
                 {
-                    LogWriter.CreateLogEntry(string.Format("{0}\n{1}", e.Message, e.InnerException != null ? e.InnerException.Message : ""));
+                    LogWriter.CreateLogEntry(string.Format("{0}: {1}; {2}", DateTime.Now, e.Message, e.InnerException != null ? e.InnerException.Message : ""));
                     return;
                 }
             }
@@ -270,7 +266,7 @@ public void Update()
                 }
                 catch (Exception e)
                 {
-                    LogWriter.CreateLogEntry(string.Format("{0}\n{1}", e.Message, e.InnerException != null ? e.InnerException.Message : ""));
+                    LogWriter.CreateLogEntry(string.Format("{0}: {1}; {2}", DateTime.Now, e.Message, e.InnerException != null ? e.InnerException.Message : ""));
                     return;
                 }
             }
@@ -308,7 +304,7 @@ public void Update()
                     }
                     catch (Exception e)
                     {
-                        LogWriter.CreateLogEntry(string.Format("{0}\n{1}", e.Message, e.InnerException != null ? e.InnerException.Message : ""));
+                        LogWriter.CreateLogEntry(string.Format("{0}: {1}; {2}", DateTime.Now, e.Message, e.InnerException != null ? e.InnerException.Message : ""));
                         return;
                     }
                 }
@@ -336,7 +332,7 @@ public void Update()
 
                 catch (Exception e)
                 {
-                    LogWriter.CreateLogEntry(string.Format("{0}\n{1}", e.Message, e.InnerException != null ? e.InnerException.Message : ""));
+                    LogWriter.CreateLogEntry(string.Format("{0}: {1}; {2}", DateTime.Now, e.Message, e.InnerException != null ? e.InnerException.Message : ""));
                     return;
                 }
             }
diff --git a/RFiDGear/DataAccessLayer/Remote/FromFile/SettingsReaderWriter.cs b/RFiDGear/DataAccessLayer/Remote/FromFile/SettingsReaderWriter.cs
index a3a4535..60d1cc1 100644
--- a/RFiDGear/DataAccessLayer/Remote/FromFile/SettingsReaderWriter.cs
+++ b/RFiDGear/DataAccessLayer/Remote/FromFile/SettingsReaderWriter.cs
@@ -111,7 +111,7 @@ public SettingsReaderWriter()
             }
             catch (Exception e)
             {
-                LogWriter.CreateLogEntry(string.Format("{0}\n{1}", e.Message, e.InnerException != null ? e.InnerException.Message : ""));
+                LogWriter.CreateLogEntry(string.Format("{0}: {1}; {2}", DateTime.Now, e.Message, e.InnerException != null ? e.InnerException.Message : ""));
             }
 
             if (!File.Exists(Path.Combine(appDataPath, _settingsFileFileName)))
@@ -195,7 +195,7 @@ public bool ReadSettings(string _fileName = "")
                 }
                 catch (Exception e)
                 {
-                    LogWriter.CreateLogEntry(string.Format("{0}\n{1}", e.Message, e.InnerException != null ? e.InnerException.Message : ""));
+                    LogWriter.CreateLogEntry(string.Format("{0}: {1}; {2}", DateTime.Now, e.Message, e.InnerException != null ? e.InnerException.Message : ""));
                     return true;
                 }
 
@@ -225,7 +225,7 @@ public bool SaveSettings(string _path = "")
             }
             catch (XmlException e)
             {
-                LogWriter.CreateLogEntry(string.Format("{0}\n{1}", e.Message, e.InnerException != null ? e.InnerException.Message : ""));
+                LogWriter.CreateLogEntry(string.Format("{0}: {1}; {2}", DateTime.Now, e.Message, e.InnerException != null ? e.InnerException.Message : ""));
                 return false;
             }
         }
@@ -250,7 +250,7 @@ protected virtual void Dispose(bool disposing)
 
                     catch (Exception e)
                     {
-                        LogWriter.CreateLogEntry(string.Format("{0}\n{1}", e.Message, e.InnerException != null ? e.InnerException.Message : ""));
+                        LogWriter.CreateLogEntry(string.Format("{0}: {1}; {2}", DateTime.Now, e.Message, e.InnerException != null ? e.InnerException.Message : ""));
                     }
                 }
 
diff --git a/RFiDGear/Resources/Manifest.de.resx b/RFiDGear/Resources/Manifest.de.resx
index 4b8cb3e..9550dcf 100644
--- a/RFiDGear/Resources/Manifest.de.resx
+++ b/RFiDGear/Resources/Manifest.de.resx
@@ -1081,4 +1081,7 @@ Needed by:
   <data name="buttonContentDoUpdateCommand" xml:space="preserve">
     <value>Update starten</value>
   </data>
+  <data name="contextMenuItemExecuteSelectedItem" xml:space="preserve">
+    <value>gewählte Aufgabe ausführen</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/RFiDGear/Resources/Manifest.en.resx b/RFiDGear/Resources/Manifest.en.resx
index 4d03d0a..153e754 100644
--- a/RFiDGear/Resources/Manifest.en.resx
+++ b/RFiDGear/Resources/Manifest.en.resx
@@ -1065,4 +1065,7 @@ Needed by:
   <data name="buttonContentDoUpdateCommand" xml:space="preserve">
     <value>Update</value>
   </data>
+  <data name="contextMenuItemExecuteSelectedItem" xml:space="preserve">
+    <value>Run Selected Task</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/RFiDGear/View/TaskViews/RFIDTasks/MifareClassicTask/MifareClassicTaskTabPages/TabPageMifareClassicDataExplorerView.xaml b/RFiDGear/View/TaskViews/RFIDTasks/MifareClassicTask/MifareClassicTaskTabPages/TabPageMifareClassicDataExplorerView.xaml
index 6ef2341..448e47e 100644
--- a/RFiDGear/View/TaskViews/RFIDTasks/MifareClassicTask/MifareClassicTaskTabPages/TabPageMifareClassicDataExplorerView.xaml
+++ b/RFiDGear/View/TaskViews/RFIDTasks/MifareClassicTask/MifareClassicTaskTabPages/TabPageMifareClassicDataExplorerView.xaml
@@ -237,6 +237,7 @@
                                                 <Style TargetType="{x:Type TextBox}">
                                                     <Setter Property="TextWrapping" Value="Wrap" />
                                                     <Setter Property="MaxWidth" Value="250" />
+                                                    <Setter Property="AcceptsReturn" Value="True" />
                                                     <!--													<Setter
 														Property="VerticalAlignment"
 														Value="Top" />
diff --git a/RFiDGear/View/TaskViews/RFIDTasks/MifareClassicTask/MifareClassicTaskTabPages/TabPageMifareClassicKeySetupView.xaml b/RFiDGear/View/TaskViews/RFIDTasks/MifareClassicTask/MifareClassicTaskTabPages/TabPageMifareClassicKeySetupView.xaml
index d6f458c..0330fba 100644
--- a/RFiDGear/View/TaskViews/RFIDTasks/MifareClassicTask/MifareClassicTaskTabPages/TabPageMifareClassicKeySetupView.xaml
+++ b/RFiDGear/View/TaskViews/RFIDTasks/MifareClassicTask/MifareClassicTaskTabPages/TabPageMifareClassicKeySetupView.xaml
@@ -267,27 +267,27 @@
                         HorizontalAlignment="Left"
                         VerticalAlignment="Top"
                         Content="Use MAD"
-                        IsChecked="{Binding UseMAD, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                        IsChecked="{Binding UseMAD, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
                     <Label
                         Grid.Row="0"
                         Grid.Column="0"
                         Height="26"
-                        Margin="128,4,0,0"
+                        Margin="265,6,0,0"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Top"
                         Content="MAD Version" />
                     <ComboBox
                         Grid.Row="0"
                         Height="24"
-                        Margin="217,4,251,9"
+                        Margin="349,8,119,10"
                         VerticalAlignment="Stretch"
                         ItemsSource="{Binding MADVersions}"
                         SelectedItem="{Binding SelectedMADVersion, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
                     <CheckBox
                         Grid.Row="0"
-                        Width="176"
+                        Width="114"
                         Height="15"
-                        Margin="0,10,53,0"
+                        Margin="0,10,0,0"
                         HorizontalAlignment="Right"
                         VerticalAlignment="Top"
                         Content="Multi Application"
@@ -326,17 +326,15 @@
                         Margin="8,9,7,7"
                         HorizontalAlignment="Stretch"
                         VerticalAlignment="Stretch"
-                        Content="Application ID" />
+                        Content="Application Code" />
                     <Label
-                        Grid.Row="1"
-                        Grid.Column="0"
-                        Margin="8,3,7,7"
+                        Grid.Column="2"
+                        Margin="10,3,10,7"
                         HorizontalAlignment="Stretch"
                         VerticalAlignment="Stretch"
-                        Content="@Sector" />
+                        Content="Start @Sector" />
                     <ComboBox
-                        Grid.Row="1"
-                        Grid.Column="1"
+                        Grid.Column="3"
                         Height="21"
                         Margin="10,8,10,7"
                         HorizontalAlignment="Stretch"
@@ -529,22 +527,20 @@
                         </GroupBox>
                     </Grid>
                     <CheckBox
-                        Grid.Row="1"
-                        Grid.Column="2"
                         Grid.ColumnSpan="2"
-                        Height="15"
-                        Margin="10,11,34,0"
-                        HorizontalAlignment="Stretch"
+                        Height="14"
+                        Margin="94,-54,0,0"
+                        HorizontalAlignment="Left"
                         VerticalAlignment="Top"
                         Content="Use MAD Authentification"
-                        IsChecked="{Binding UseMadAuth, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                        IsChecked="{Binding UseMadAuth, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Width="162" />
                     <Label
                         Grid.Column="2"
                         Height="26"
-                        Margin="10,8,6,2"
+                        Margin="10,3,6,7"
                         HorizontalAlignment="Stretch"
                         VerticalAlignment="Stretch"
-                        Content="Size" />
+                        Content="Size" Grid.Row="1" />
                     <TextBox
                         Grid.Column="3"
                         Height="21"
@@ -553,7 +549,7 @@
                         VerticalAlignment="Top"
                         HorizontalContentAlignment="Left"
                         VerticalContentAlignment="Center"
-                        Text="{Binding FileSize, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
+                        Text="{Binding FileSize, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Grid.Row="1">
 
                         <TextBox.Resources>
                             <Style TargetType="{x:Type TextBox}">
@@ -581,16 +577,51 @@
                         VerticalAlignment="Top"
                         HorizontalContentAlignment="Left"
                         VerticalContentAlignment="Center"
-                        Text="{Binding AppNumber, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
+                        Text="{Binding ApplicationCode, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
+                        <TextBox.Resources>
+                            <Style TargetType="{x:Type TextBox}">
+                                <Style.Triggers>
+                                    <DataTrigger Binding="{Binding IsValidApplicationCode}" Value="True">
+                                        <Setter Property="Foreground" Value="Green" />
+                                        <Setter Property="Background" Value="White" />
+                                        <Setter Property="FontWeight" Value="Normal" />
+                                    </DataTrigger>
+                                    <DataTrigger Binding="{Binding IsValidApplicationCode}" Value="False">
+                                        <Setter Property="Foreground" Value="Black" />
+                                        <Setter Property="Background" Value="Red" />
+                                        <Setter Property="FontWeight" Value="Normal" />
+                                    </DataTrigger>
+                                </Style.Triggers>
+                            </Style>
+                        </TextBox.Resources>
+                    </TextBox>
+                    <Label
+                        Grid.Row="1"
+                        Grid.Column="0"
+                        Height="26"
+                        Margin="8,6,7,4"
+                        HorizontalAlignment="Stretch"
+                        VerticalAlignment="Stretch"
+                        Content="Function Cluster Code" />
+                    <TextBox
+                        Grid.Row="1"
+                        Grid.Column="1"
+                        Height="21"
+                        Margin="10,5,10,0"
+                        HorizontalAlignment="Stretch"
+                        VerticalAlignment="Top"
+                        HorizontalContentAlignment="Left"
+                        VerticalContentAlignment="Center"
+                        Text="{Binding FunctionClusterCode, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
                         <TextBox.Resources>
                             <Style TargetType="{x:Type TextBox}">
                                 <Style.Triggers>
-                                    <DataTrigger Binding="{Binding IsValidAppNumber}" Value="True">
+                                    <DataTrigger Binding="{Binding IsValidFunctionClusterCode}" Value="True">
                                         <Setter Property="Foreground" Value="Green" />
                                         <Setter Property="Background" Value="White" />
                                         <Setter Property="FontWeight" Value="Normal" />
                                     </DataTrigger>
-                                    <DataTrigger Binding="{Binding IsValidAppNumber}" Value="False">
+                                    <DataTrigger Binding="{Binding IsValidFunctionClusterCode}" Value="False">
                                         <Setter Property="Foreground" Value="Black" />
                                         <Setter Property="Background" Value="Red" />
                                         <Setter Property="FontWeight" Value="Normal" />
diff --git a/RFiDGear/ViewModel/HirarchicalDataTemplateViewModels/RFiDChipGrandChildLayerViewModel.cs b/RFiDGear/ViewModel/HirarchicalDataTemplateViewModels/RFiDChipGrandChildLayerViewModel.cs
index 1efc5c6..99e2174 100644
--- a/RFiDGear/ViewModel/HirarchicalDataTemplateViewModels/RFiDChipGrandChildLayerViewModel.cs
+++ b/RFiDGear/ViewModel/HirarchicalDataTemplateViewModels/RFiDChipGrandChildLayerViewModel.cs
@@ -370,7 +370,7 @@ public string DataAsHexString
             }
             set
             {
-                dataBlockAsHexString = value.Replace("\r", "").Replace("\n", "").Replace(" ", "");
+                dataBlockAsHexString = value.Replace("\r", "").Replace("\n", "").Replace(" ", "").Replace("-", "");
 
                 if (mifareClassicDataBlock != null && value.Length == 32 && CustomConverter.IsInHexFormat(value))
                 {
diff --git a/RFiDGear/ViewModel/MainWindowViewModel.cs b/RFiDGear/ViewModel/MainWindowViewModel.cs
index a43c461..41e2697 100644
--- a/RFiDGear/ViewModel/MainWindowViewModel.cs
+++ b/RFiDGear/ViewModel/MainWindowViewModel.cs
@@ -157,6 +157,13 @@ public MainWindowViewModel()
                 })
             });
 
+            rowContextMenuItems.Add(new MenuItem()
+            {
+                Header = ResourceLoader.GetResource("contextMenuItemExecuteSelectedItem"),
+                Command = WriteSelectedTaskToChipOnceCommand
+            });
+
+
             Application.Current.MainWindow.Closing += new CancelEventHandler(CloseThreads);
             Application.Current.MainWindow.Activated += new EventHandler(LoadCompleted);
             updater.NewVersionAvailable += new EventHandler(EnableUpdate);
@@ -651,7 +658,6 @@ private void OnNewCreateDesfireTaskCommand()
             {
                 if (device != null)
                 {
-
                     Dialogs.Add(new MifareDesfireSetupViewModel(SelectedSetupViewModel, dialogs)
                     {
                         Caption = ResourceLoader.GetResource("windowCaptionAddEditMifareDesfireTask"),
@@ -3795,6 +3801,12 @@ private void AskForUpdateNow()
                 },
 
                 OnCancel = (updateAction) =>
+                {
+                    updater.AllowUpdate = false;
+                    updateAction.Close();
+                },
+
+                OnCloseRequest = (updateAction) =>
                 {
                     updater.AllowUpdate = false;
                     updateAction.Close();
diff --git a/RFiDGear/ViewModel/TaskSetupViewModels/MifareClassicSetupViewModel.cs b/RFiDGear/ViewModel/TaskSetupViewModels/MifareClassicSetupViewModel.cs
index 73a997d..2fcf880 100644
--- a/RFiDGear/ViewModel/TaskSetupViewModels/MifareClassicSetupViewModel.cs
+++ b/RFiDGear/ViewModel/TaskSetupViewModels/MifareClassicSetupViewModel.cs
@@ -162,14 +162,8 @@ public class MifareClassicSetupViewModel : ViewModelBase, IUserDialogViewModel
                                               AccessCondition_MifareClassicSectorTrailer.NotAllowed)
              });
 
-        private MifareClassicChipModel chipModel;
         private MifareClassicSectorModel sectorModel;
-        private MifareClassicDataBlockModel dataBlock0 = new MifareClassicDataBlockModel();
-        private MifareClassicDataBlockModel dataBlock1 = new MifareClassicDataBlockModel();
-        private MifareClassicDataBlockModel dataBlock2 = new MifareClassicDataBlockModel();
-        private MifareClassicDataBlockModel dataBlockCombined = new MifareClassicDataBlockModel();
-
-        private DatabaseReaderWriter databaseReaderWriter;
+  
         private SettingsReaderWriter settings = new SettingsReaderWriter();
 
         private byte madGPB = 0xC1;
@@ -185,8 +179,6 @@ public MifareClassicSetupViewModel()
         {
             MefHelper.Instance.Container.ComposeParts(this); //Load Plugins
 
-            chipModel = new MifareClassicChipModel(string.Format("Task Description: {0}", SelectedTaskDescription), CARD_TYPE.Mifare4K);
-
             sectorModel = new MifareClassicSectorModel(4,
                                                        AccessCondition_MifareClassicSectorTrailer.NotAllowed,
                                                        AccessCondition_MifareClassicSectorTrailer.Allowed_With_KeyA,
@@ -225,10 +217,6 @@ public MifareClassicSetupViewModel(object _selectedSetupViewModel, ObservableCol
             {
                 MefHelper.Instance.Container.ComposeParts(this); //Load Plugins
 
-                databaseReaderWriter = new DatabaseReaderWriter();
-
-                chipModel = new MifareClassicChipModel(string.Format("Task Description: {0}", SelectedTaskDescription), CARD_TYPE.Mifare4K);
-
                 sectorModel = new MifareClassicSectorModel(4,
                                                            AccessCondition_MifareClassicSectorTrailer.NotAllowed,
                                                            AccessCondition_MifareClassicSectorTrailer.Allowed_With_KeyA,
@@ -253,19 +241,18 @@ public MifareClassicSetupViewModel(object _selectedSetupViewModel, ObservableCol
                 Selected_Sector_AccessCondition = sectorTrailer_AccessBits[4];
                 Selected_DataBlock_AccessCondition = dataBlock_AccessBits[0];
 
-                SelectedClassicSectorCurrent = "0";
-                SelectedMADSector = "1";
-                SelectedMADVersion = "1";
-
-                MifareClassicKeys = CustomConverter.GenerateStringSequence(0, 39).ToArray();
-                MADVersions = CustomConverter.GenerateStringSequence(1, 3).ToArray();
-                MADSectors = CustomConverter.GenerateStringSequence(1, 39).ToArray();
-                AppNumber = "1";
-
                 ClassicMADKeyAKeyCurrent = "FFFFFFFFFFFF";
                 ClassicMADKeyBKeyCurrent = "FFFFFFFFFFFF";
                 ClassicMADKeyAKeyTarget = "FFFFFFFFFFFF";
                 ClassicMADKeyBKeyTarget = "FFFFFFFFFFFF";
+                ApplicationCode = "00";
+                FunctionClusterCode = "00";
+
+                SelectedClassicSectorCurrent = "0";
+                SelectedMADSector = "1";
+                SelectedMADVersion = "1";
+
+                appNumberAsInt = 0;
 
                 ClassicKeyAKeyCurrent = settings.DefaultSpecification.MifareClassicDefaultSecuritySettings[0].AccessBits.Split(new[] { ',', ';' })[0];
                 ClassicKeyBKeyCurrent = settings.DefaultSpecification.MifareClassicDefaultSecuritySettings[0].AccessBits.Split(new[] { ',', ';' })[2];
@@ -291,6 +278,11 @@ public MifareClassicSetupViewModel(object _selectedSetupViewModel, ObservableCol
 
                         p.SetValue(this, p.GetValue(_selectedSetupViewModel));
                     }
+
+                    MifareClassicKeys = CustomConverter.GenerateStringSequence(0, 39).ToArray();
+                    MADVersions = CustomConverter.GenerateStringSequence(1, 3).ToArray();
+                    MADSectors = CustomConverter.GenerateStringSequence(1, 39).ToArray();
+
                 }
 
                 else
@@ -307,6 +299,10 @@ public MifareClassicSetupViewModel(object _selectedSetupViewModel, ObservableCol
 
                     IsWriteFromMemoryToChipChecked = true;
 
+                    MifareClassicKeys = CustomConverter.GenerateStringSequence(0, 39).ToArray();
+                    MADVersions = CustomConverter.GenerateStringSequence(1, 3).ToArray();
+                    MADSectors = CustomConverter.GenerateStringSequence(1, 39).ToArray();
+
                     SelectedTaskIndex = "0";
                     SelectedTaskDescription = "Enter a Description";
                 }
@@ -317,15 +313,11 @@ public MifareClassicSetupViewModel(object _selectedSetupViewModel, ObservableCol
                 {
                     SelectedPlugin = Items.FirstOrDefault();
                 }
-
-                useMAD = false;
-
             }
             catch (Exception e)
             {
                 LogWriter.CreateLogEntry(string.Format("{0}: {1}; {2}", DateTime.Now, e.Message, e.InnerException != null ? e.InnerException.Message : ""));
             }
-
         }
 
         #endregion
@@ -904,6 +896,7 @@ public bool UseMAD
         /// <summary>
         /// 
         /// </summary>
+        [XmlIgnore]
         public bool UseMADInvert => !UseMAD;
 
         /// <summary>
@@ -1176,7 +1169,8 @@ public bool DataBlockIsCombinedToggleButtonIsChecked
         #region MADEditor
 
         [XmlIgnore]
-        public string[] MADVersions { get; set; }
+        public string[] MADVersions { get; 
+            set; }
 
         /// <summary>
         /// 
@@ -1296,6 +1290,79 @@ public bool? IsValidFileSize
         }
         private bool? isValidFileSize;
 
+        /// <summary>
+        ///
+        /// </summary>
+        public string ApplicationCode
+        {
+            get => applicationCode;
+            set
+            {
+                applicationCode = value.Length > 2 ? value.ToUpper().Remove(2, value.Length - 2) : value.ToUpper();
+                IsValidApplicationCode = (CustomConverter.IsInHexFormat(applicationCode) && applicationCode.Length<=2);
+                RaisePropertyChanged("ApplicationCode");
+            }
+        }
+        private string applicationCode;
+
+        /// <summary>
+        ///
+        /// </summary>
+        [XmlIgnore]
+        public bool? IsValidApplicationCode
+        {
+            get => isValidApplicationCode;
+            set
+            {
+                isValidApplicationCode = value;
+
+                if(isValidApplicationCode == true)
+                {
+                    appNumberAsInt &= 0xff00;
+                    appNumberAsInt |= CustomConverter.GetBytes(applicationCode, out int _)[0];
+                }
+                RaisePropertyChanged("IsValidApplicationCode");
+            }
+        }
+        private bool? isValidApplicationCode;
+
+        /// <summary>
+        ///
+        /// </summary>
+        public string FunctionClusterCode
+        {
+            get => functionClusterCode;
+            set
+            {
+                functionClusterCode = value.Length > 2 ? value.ToUpper().Remove(2, value.Length - 2) : value.ToUpper();
+                IsValidFunctionClusterCode = (CustomConverter.IsInHexFormat(functionClusterCode) && functionClusterCode.Length <= 2);
+                RaisePropertyChanged("FunctionClusterCode");
+            }
+        }
+        private string functionClusterCode;
+
+        /// <summary>
+        ///
+        /// </summary>
+        [XmlIgnore]
+        public bool? IsValidFunctionClusterCode
+        {
+            get => isValidFunctionClusterCode;
+            set
+            {
+                isValidFunctionClusterCode = value;
+
+                if (isValidFunctionClusterCode == true)
+                {
+                    appNumberAsInt &= 0x00ff;
+                    appNumberAsInt |= (CustomConverter.GetBytes(functionClusterCode, out int _)[0] << 8);
+                }
+                RaisePropertyChanged("IsValidFunctionClusterCode");
+            }
+        }
+        private bool? isValidFunctionClusterCode;
+
+        /*
         /// <summary>
         ///
         /// </summary>
@@ -1310,6 +1377,7 @@ public string AppNumber
             }
         }
         private string appNumber;
+        */
         private int appNumberAsInt;
 
         /// <summary>