Show current terminal application in settings

Author: FelixZacher

Files/App.xaml.cs

@@ -98,8 +98,6 @@ public App()
 
         private async void LoadTerminalApps()
         {
-            ApplicationData.Current.LocalSettings.Values["terminal_id"] = 1;
-
             var localFolder = ApplicationData.Current.LocalFolder;
             var localSettingsFolder = await localFolder.CreateFolderAsync("settings", CreationCollisionOption.OpenIfExists);
             StorageFile file;

Files/Interacts/Interaction.cs

@@ -94,7 +94,11 @@ public void OpenDirectoryInNewTab_Click(object sender, RoutedEventArgs e)
         public async void OpenDirectoryInTerminal(object sender, RoutedEventArgs e)
         {
             var localSettings = ApplicationData.Current.LocalSettings;
-            var terminalId = (int)localSettings.Values["terminal_id"];
+
+            var terminalId = 1;
+
+            if (localSettings.Values["terminal_id"] != null) terminalId = (int)localSettings.Values["terminal_id"];
+
             var terminal = App.Terminals.Single(p => p.Id == terminalId);
 
             localSettings.Values["Application"] = terminal.Path;

Files/SettingsPages/Preferences.xaml

@@ -59,8 +59,9 @@
                         <TextBlock FontSize="20" Text="Terminal Applications"/>
 
                         <ComboBox
-                        Header="Choose Terminal Application"
-                        ItemsSource="{x:Bind Terminals}"
+                            x:Name="TerminalApplicationsComboBox"
+                            Header="Choose Terminal Application"
+                            ItemsSource="{x:Bind Terminals}"
                             SelectionChanged="TerminalApp_SelectionChanged">
                             <ComboBox.ItemTemplate>
                                 <DataTemplate x:DataType="datamodels:TerminalModel">

Files/SettingsPages/Preferences.xaml.cs

@@ -9,6 +9,8 @@
 using Files.DataModels;
 using System.Collections.ObjectModel;
 using Windows.System;
+using Windows.UI.Xaml.Navigation;
+using System.Linq;
 
 namespace Files.SettingsPages
 {
@@ -78,31 +80,20 @@ public Preferences()
                 OneDriveL.IsEnabled = false;
             }
             SuccessMark.Visibility = Windows.UI.Xaml.Visibility.Collapsed;
-
-            LoadTerminalsAsync();
         }
 
-        private async System.Threading.Tasks.Task LoadTerminalsAsync()
+        protected override void OnNavigatedTo(NavigationEventArgs e)
         {
-            var localSettingsFolder = await localFolder.CreateFolderAsync("settings", CreationCollisionOption.OpenIfExists);
-            StorageFile file;
-            try
-            {
-                file = await localSettingsFolder.GetFileAsync("terminal.json");
-            }
-            catch (FileNotFoundException ex)
-            {
-                var defaultFile = StorageFile.GetFileFromApplicationUriAsync(new Uri("ms-appx:///Assets/terminal/terminal.json"));
+            base.OnNavigatedTo(e);
 
-                file = await localSettingsFolder.CreateFileAsync("terminal.json");
-                await FileIO.WriteBufferAsync(file, await FileIO.ReadBufferAsync(await defaultFile));
-            }
-                        
-            var content = await FileIO.ReadTextAsync(file);
-
-            var terminals = JsonConvert.DeserializeObject<TerminalFileModel>(content).Terminals;
+            var terminals = App.Terminals;
 
             foreach (var terminal in terminals) Terminals.Add(terminal);
+
+            var terminalId = 1;
+            if (localSettings.Values["terminal_id"] != null) terminalId = (int) localSettings.Values["terminal_id"];
+
+            TerminalApplicationsComboBox.SelectedItem = Terminals.Single(p => p.Id == terminalId);
         }
 
         private void ToggleSwitch_Toggled(object sender, Windows.UI.Xaml.RoutedEventArgs e)