From a9fdb58cac466706fec8f322df8914cd979a95d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=94=D0=B0=D0=B2=D0=B8=D0=B4=20=D0=A7=D0=B5=D1=80=D0=BD?=
 =?UTF-8?q?=D0=BE=D0=BF=D1=8F=D1=82=D0=BE=D0=B2?= <vectisraw@gmail.com>
Date: Wed, 10 Apr 2024 01:39:42 +0300
Subject: [PATCH] The most significant changes in the code include the addition
 of a new HTML file `changelog\1.4.8.html` to the project `NebulaAuth.sln`,
 which displays the changelog for version 1.4.8 of the software. A new
 converter `ProxyDataTextConverter` was added to `App.xaml` and a new class
 `ProxyDataTextConverter` was added in `ProxyTextConverter.cs`. The
 `ProxyTextConverter` was also modified to include the port number in the
 return string.

Several methods were added and modified in `Storage.cs`, `MainVM_Groups.cs`, `MainVM_Proxy.cs`, and `ProxyManagerVM.cs` to validate if the data can be saved before performing various operations. The `SnackbarController.cs` was modified to increase the minimum snackbar time and adjust the duration calculation.

In `MafileSerializer_SessionData.cs`, the check for whether the refresh token is expired or not was moved to a different location within the code. New localization entries were added in `localization.loc.json`.

The changes are as follows:

1. Added a new HTML file `changelog\1.4.8.html` to the project `NebulaAuth.sln`.
2. Added a new converter `ProxyDataTextConverter` to `App.xaml`.
3. Imported `AchiesUtilities.Web.Proxy` in `ProxyTextConverter.cs`.
4. Modified the return string in `ProxyTextConverter` to include the port number.
5. Added a new class `ProxyDataTextConverter` in `ProxyTextConverter.cs`.
6. Increased the minimum snackbar time from 1000 to 1200 in `SnackbarController.cs`.
7. Modified the duration calculation in `GetSnackbarTime` method in `SnackbarController.cs`.
8. Added tooltips to ComboBoxes in `MainWindow.xaml`.
9. Added a new method `ValidateCanSave` in `Storage.cs` to validate if the data can be saved.
10. Added a new method `GetProxyString` in `ProxyStorage.cs` to get the proxy string.
11. Modified the `CompareProxy` method in `ProxyStorage.cs` to compare the address and port of the proxy data.
12. Removed a logger info line in `Shell.cs`.
13. Added a new property `DuplicateFound` in `Storage.cs`.
14. Modified the `CreatePathForMafile` method in `Storage.cs` to create a file name based on the account name or steam id.
15. Modified the `AddGroup` method in `MainVM_Groups.cs` to validate if the data can be saved before adding a group.
16. Modified the `AddToGroup` method in `MainVM_Groups.cs` to validate if the data can be saved before adding to a group.
17. Modified the `RemoveGroup` method in `MainVM_Groups.cs` to validate if the data can be saved before removing a group.
18. Modified the `PerformQuery` method in `MainVM_Groups.cs` to set `SelectedMafile` to the first item in `MaFiles`.
19. Modified the `RemoveProxy` method in `MainVM_Proxy.cs` to validate if the data can be saved before removing a proxy.
20. Modified the `SelectedProxyChanged` method in `MainVM_Proxy.cs` to validate if the data can be saved before changing the selected proxy.
21. Added a new method `ValidateCanSaveAndWarn` in `MainVM_Proxy.cs` to validate if the data can be saved and send a snackbar message if it can't.
22. Modified the `TimerCheckSeconds` property in `MainVM_Timer.cs` to send a snackbar message when the timer is changed.
23. Added a new method `RemoveProxy` in `LoginAgainOnImportVM.cs` to remove the selected proxy.
24. Modified the `AddProxy` method in `ProxyManagerVM.cs` to use the `DefaultScheme` to parse the proxy data.
25. Modified the `AddProxy` method in `ProxyManagerVM.cs` to use the `DefaultScheme` to parse the proxy data and get the proxy string.
26. Modified the `CopyProxy` method in `ProxyManagerVM.cs` to get the proxy string.
27. Added new localization entries in `localization.loc.json`.
28. The `update.xml` file was updated to reflect the new version of the software (1.4.8.0) and the corresponding download URL and changelog URL were updated accordingly.
29. In `AdmissionHelper.cs`, a new constant `SESSION_ID_COOKIE_NAME` was added to replace hardcoded "sessionid" strings. The same was done for `LANGUAGE_COOKIE_NAME` replacing "Steam_Language". This change was reflected in multiple methods within the `AdmissionHelper` class.
30. A new method `CloneCookie` was added to `AdmissionHelper.cs` to create a copy of a given cookie. This method was then used to replace repetitive code in the `TransferCommunityCookies` method.
31. In `MafileSerializer_SessionData.cs`, the check for whether the refresh token is expired or not was moved to a different location within the code. This change does not affect the functionality but may improve readability or maintainability of the code.
---
 NebulaAuth.sln                                |  1 +
 NebulaAuth/App.xaml                           |  1 +
 NebulaAuth/Converters/ProxyTextConverter.cs   | 21 ++++-
 NebulaAuth/Core/SnackbarController.cs         | 15 ++--
 NebulaAuth/MainWindow.xaml                    |  4 +-
 NebulaAuth/Model/ProxyStorage.cs              | 37 +++++---
 NebulaAuth/Model/Shell.cs                     |  1 -
 NebulaAuth/Model/Storage.cs                   | 25 ++++--
 .../Dialogs/LoginAgainOnImportDialog.xaml     |  9 +-
 NebulaAuth/View/ProxyManagerView.xaml         | 13 +--
 NebulaAuth/ViewModel/MainVM.cs                |  2 +-
 NebulaAuth/ViewModel/MainVM_Groups.cs         | 12 +--
 NebulaAuth/ViewModel/MainVM_Proxy.cs          | 13 +++
 NebulaAuth/ViewModel/MainVM_Timer.cs          |  1 +
 .../ViewModel/Other/LoginAgainOnImportVM.cs   |  8 ++
 NebulaAuth/ViewModel/Other/ProxyManagerVM.cs  | 32 +++----
 NebulaAuth/localization.loc.json              | 36 +++++++-
 NebulaAuth/update.xml                         |  6 +-
 .../Authentication/AdmissionHelper.cs         | 26 +++---
 .../MaFiles/MafileSerializer_SessionData.cs   | 16 ++--
 changelog/1.4.8.html                          | 84 +++++++++++++++++++
 21 files changed, 280 insertions(+), 83 deletions(-)
 create mode 100644 changelog/1.4.8.html

diff --git a/NebulaAuth.sln b/NebulaAuth.sln
index b3092fc..d813747 100644
--- a/NebulaAuth.sln
+++ b/NebulaAuth.sln
@@ -19,6 +19,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "changelog", "changelog", "{
 		changelog\1.4.5.html = changelog\1.4.5.html
 		changelog\1.4.6.html = changelog\1.4.6.html
 		changelog\1.4.7.html = changelog\1.4.7.html
+		changelog\1.4.8.html = changelog\1.4.8.html
 	EndProjectSection
 EndProject
 Global
diff --git a/NebulaAuth/App.xaml b/NebulaAuth/App.xaml
index 8f47884..ba657d7 100644
--- a/NebulaAuth/App.xaml
+++ b/NebulaAuth/App.xaml
@@ -18,6 +18,7 @@
             <converters:OnOffBoolTextConverter x:Key="OnOffBoolTextConverter"/>
             <converters:SelectedProxyTextConverter x:Key="SelectedProxyTextConverter"/>
             <converters:ProxyTextConverter x:Key="ProxyTextConverter"/>
+            <converters:ProxyDataTextConverter x:Key="ProxyDataTextConverter"/>
             <converters:MultiCommandParameterConverter x:Key="MultiCommandParameterConverter"/>
             <converters:ColorToBrushConverter x:Key="ColorToBrushConverter"/>
             <!-- Background converters-->
diff --git a/NebulaAuth/Converters/ProxyTextConverter.cs b/NebulaAuth/Converters/ProxyTextConverter.cs
index 889a351..a3806fb 100644
--- a/NebulaAuth/Converters/ProxyTextConverter.cs
+++ b/NebulaAuth/Converters/ProxyTextConverter.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Globalization;
 using System.Windows.Data;
+using AchiesUtilities.Web.Proxy;
 using NebulaAuth.Model.Entities;
 
 namespace NebulaAuth.Converters;
@@ -14,7 +15,25 @@ public class ProxyTextConverter : IValueConverter
             return string.Empty;
         }
 
-        return $"{p.Id}: {p.Data.Address}";
+        return $"{p.Id}: {p.Data.Address}:{p.Data.Port}";
+    }
+
+    public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+    {
+        throw new NotImplementedException();
+    }
+}
+
+public class ProxyDataTextConverter : IValueConverter
+{
+    public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+    {
+        if (value is not ProxyData p)
+        {
+            return string.Empty;
+        }
+
+        return $"{p.Address}:{p.Port}";
     }
 
     public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
diff --git a/NebulaAuth/Core/SnackbarController.cs b/NebulaAuth/Core/SnackbarController.cs
index fc0accb..fb3ac05 100644
--- a/NebulaAuth/Core/SnackbarController.cs
+++ b/NebulaAuth/Core/SnackbarController.cs
@@ -7,11 +7,8 @@ public class SnackbarController
 {
 
     public static SnackbarMessageQueue MessageQueue { get; } = new() { DiscardDuplicates = true};
-    private const int MIN_SNACKBAR_TIME = 1000;
-    public SnackbarController()
-    {
+    private const int MIN_SNACKBAR_TIME = 1200;
 
-    }
     /// <summary>
     /// 
     /// </summary>
@@ -46,10 +43,12 @@ public class SnackbarController
 
     private static TimeSpan GetSnackbarTime(string str)
     {
-        if (str.Length <= 100) return TimeSpan.FromMilliseconds(MIN_SNACKBAR_TIME);
-                
-        var length = str.Length / 0.07;
-        return TimeSpan.FromMilliseconds(length);
+        var duration = str.Length / 0.03;
+        if (duration < MIN_SNACKBAR_TIME)
+        {
+           duration = MIN_SNACKBAR_TIME;
+        }
+        return TimeSpan.FromMilliseconds(duration);
 
     }
 
diff --git a/NebulaAuth/MainWindow.xaml b/NebulaAuth/MainWindow.xaml
index 71982c4..ee42c42 100644
--- a/NebulaAuth/MainWindow.xaml
+++ b/NebulaAuth/MainWindow.xaml
@@ -68,7 +68,7 @@
                             </MenuItem>
                         </Menu>
                         <Separator />
-                        <ComboBox MinWidth="100" Margin="8,0,8,0" VerticalAlignment="Center" md:HintAssist.Hint="{Tr MainWindow.AppBar.GroupsHint}" md:TextFieldAssist.HasClearButton="True" IsEditable="True" ItemsSource="{Binding Groups}" SelectedValue="{Binding SelectedGroup}">
+                        <ComboBox ToolTip="{Tr MainWindow.AppBar.GroupToolTip}" MinWidth="100" Margin="8,0,8,0" VerticalAlignment="Center" md:HintAssist.Hint="{Tr MainWindow.AppBar.GroupsHint}" md:TextFieldAssist.HasClearButton="True" IsEditable="True" ItemsSource="{Binding Groups}" SelectedValue="{Binding SelectedGroup}">
                             <FrameworkElement.Resources>
                                 <ResourceDictionary>
                                     <Style TargetType="md:PackIcon">
@@ -81,7 +81,7 @@
                                 <KeyBinding Key="Enter" Command="{Binding AddGroupCommand}" CommandParameter="{Binding Path=Text, RelativeSource={RelativeSource AncestorType=ComboBox}}" />
                             </UIElement.InputBindings>
                         </ComboBox>
-                        <ComboBox MinWidth="100" Margin="8,0,8,0" VerticalAlignment="Center" md:HintAssist.Hint="{Tr MainWindow.AppBar.Proxy.ProxyHint}" md:ComboBoxAssist.ShowSelectedItem="False" SelectedItem="{Binding SelectedProxy}" ItemsSource="{Binding Proxies}">
+                        <ComboBox ToolTip="{Tr MainWindow.AppBar.Proxy.ProxyManipulateToolTip}" MinWidth="100" Margin="8,0,8,0" VerticalAlignment="Center" md:HintAssist.Hint="{Tr MainWindow.AppBar.Proxy.ProxyHint}" md:ComboBoxAssist.ShowSelectedItem="False" SelectedItem="{Binding SelectedProxy}" ItemsSource="{Binding Proxies}">
                             <ItemsControl.ItemTemplate>
                                 <DataTemplate DataType="{x:Type entities:MaProxy}">
                                     <TextBlock Text="{Binding Converter={StaticResource ProxyTextConverter}, Mode=OneWay}" />
diff --git a/NebulaAuth/Model/ProxyStorage.cs b/NebulaAuth/Model/ProxyStorage.cs
index c198ada..b761a48 100644
--- a/NebulaAuth/Model/ProxyStorage.cs
+++ b/NebulaAuth/Model/ProxyStorage.cs
@@ -3,6 +3,7 @@ using System.IO;
 using AchiesUtilities.Collections;
 using AchiesUtilities.Web.Proxy;
 using System.Linq;
+using AchiesUtilities.Web.Proxy.Parsing;
 using NebulaAuth.Core;
 using Newtonsoft.Json;
 
@@ -12,13 +13,21 @@ public static class ProxyStorage
 {
     public const string FORMAT = ADDRESS_FORMAT + ":{USER}:{PASS}";
     public const string ADDRESS_FORMAT = "{IP}:{PORT}";
+
+    public static readonly ProxyScheme DefaultScheme = new ProxyScheme(
+        ProxyDefaultFormats.UniversalHostFirstColonDelimiter, false, ProxyProtocol.HTTP,
+        ProxyPatternProtocol.HTTP | ProxyPatternProtocol.HTTPs,
+        ProxyPatternHostFormat.Domain | ProxyPatternHostFormat.IPv4, PatternRequirement.Optional,
+        PatternRequirement.Optional);
+
+
     public static ObservableDictionary<int, ProxyData> Proxies { get; } = new();
 
 
     static ProxyStorage()
     {
 
-        if(File.Exists("proxies.json") == false)
+        if (File.Exists("proxies.json") == false)
             return;
         try
         {
@@ -34,14 +43,14 @@ public static class ProxyStorage
                 MaClient.DefaultProxy = Proxies[proxies.DefaultProxy.Value];
             }
         }
-        catch(Exception ex)
+        catch (Exception ex)
         {
             SnackbarController.SendSnackbar("Ошибка при загрузке прокси");
             SnackbarController.SendSnackbar(ex.Message);
         }
 
 
-        
+
     }
 
     public static void SetProxy(int? id, ProxyData proxyData)
@@ -67,8 +76,8 @@ public static class ProxyStorage
         Save();
     }
     public static bool CompareProxy(ProxyData proxyData1, ProxyData proxyData2)
-       {
-        return proxyData1.ToString(FORMAT) == proxyData2.ToString(FORMAT);
+    {
+        return proxyData1.Address == proxyData2.Address && proxyData1.Port == proxyData2.Port;
     }
 
 
@@ -79,16 +88,21 @@ public static class ProxyStorage
         File.WriteAllText("proxies.json", json);
     }
 
+    public static string GetProxyString(ProxyData proxyData)
+    {
+        return proxyData.AuthEnabled ? proxyData.ToString(FORMAT) : proxyData.ToString(ADDRESS_FORMAT);
+    }
+
     private static Proxies Create()
     {
         int? def = null;
         if (MaClient.DefaultProxy != null)
         {
-           var search =  Proxies.FirstOrDefault(p => p.Value.Equals(MaClient.DefaultProxy));
-           if (search.Value != null!)
-           {
-               def = search.Key;
-           }
+            var search = Proxies.FirstOrDefault(p => p.Value.Equals(MaClient.DefaultProxy));
+            if (search.Value != null!)
+            {
+                def = search.Key;
+            }
         }
 
         return new Proxies
@@ -97,7 +111,8 @@ public static class ProxyStorage
             DefaultProxy = def
         };
     }
-   
+
+
 }
 
 public class Proxies
diff --git a/NebulaAuth/Model/Shell.cs b/NebulaAuth/Model/Shell.cs
index b6facbc..a09ca29 100644
--- a/NebulaAuth/Model/Shell.cs
+++ b/NebulaAuth/Model/Shell.cs
@@ -32,7 +32,6 @@ public static class Shell
             throw new CantAlignTimeException("", ex);
         }
         ExtensionsLogger.LogDebug("Application started");
-        Logger.Info("Test");
     }
 
     private static void CurrentDomainOnUnhandledException(object sender, UnhandledExceptionEventArgs e)
diff --git a/NebulaAuth/Model/Storage.cs b/NebulaAuth/Model/Storage.cs
index 70c1b5d..be74735 100644
--- a/NebulaAuth/Model/Storage.cs
+++ b/NebulaAuth/Model/Storage.cs
@@ -9,6 +9,7 @@ using SteamLib.Utility.MaFiles;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.DirectoryServices.ActiveDirectory;
 using System.IO;
 using System.Linq;
 
@@ -23,6 +24,7 @@ public static class Storage
     public static string RemovedMafileFolder { get; } = Path.GetFullPath(REMOVED_F);
 
     public static ObservableCollection<Mafile> MaFiles { get; } = new();
+
     public static readonly int DuplicateFound;
     static Storage()
     {
@@ -48,7 +50,7 @@ public static class Storage
             {
                 var data = ReadMafile(file);
 
-                if (hashNames.Contains(data.AccountName) ||  (data.SessionData != null && hashIds.Contains(data.SessionData.SteamId)))
+                if (hashNames.Contains(data.AccountName) || (data.SessionData != null && hashIds.Contains(data.SessionData.SteamId)))
                 {
                     DuplicateFound++;
                     Shell.Logger.Error("Duplicate mafile {file}", Path.GetFileName(file));
@@ -217,16 +219,18 @@ public static class Storage
 
     private static string CreatePathForMafile(Mafile data)
     {
-        if (data.SessionData == null)
-            throw new NullReferenceException("SessionData was null can't retrieve SteamId"); //TODO: handle with login
-
-        var useAccountName = Settings.Instance.UseAccountNameAsMafileName;
-        if (!useAccountName && (data.SessionData.SteamId.Steam64 == 0 || data.SessionData.SteamId.Steam64 == SteamId64.SEED))
+        string fileName;
+        if (Settings.Instance.UseAccountNameAsMafileName)
         {
-            useAccountName = true;
+            fileName = CreateFileNameWithAccountName(data.AccountName);
         }
+        else
+        {
+            if(data.SessionData == null)
+                throw new NullReferenceException("SessionData was null can't retrieve SteamId"); //FIXME: think about better way to handle
 
-        var fileName = useAccountName ? CreateFileNameWithAccountName(data.AccountName) : CreateFileNameWithSteamId(data.SessionData.SteamId);
+            fileName = CreateFileNameWithSteamId(data.SessionData.SteamId);
+        }
 
         return Path.Combine(MafileFolder, fileName);
     }
@@ -257,6 +261,11 @@ public static class Storage
         }
         return null;
     }
+
+    public static bool ValidateCanSave(Mafile data)
+    {
+       return Settings.Instance.UseAccountNameAsMafileName || data.SessionData != null;
+    }
 }
 
 internal class MafileNameComparer : IComparer<string>
diff --git a/NebulaAuth/View/Dialogs/LoginAgainOnImportDialog.xaml b/NebulaAuth/View/Dialogs/LoginAgainOnImportDialog.xaml
index 328113e..60acae9 100644
--- a/NebulaAuth/View/Dialogs/LoginAgainOnImportDialog.xaml
+++ b/NebulaAuth/View/Dialogs/LoginAgainOnImportDialog.xaml
@@ -29,16 +29,19 @@
             <Run FontWeight="Bold" Text="{Binding UserName}"/>
         </TextBlock>
         <TextBox Text="{Binding Password}" Margin="10,10,10,0" Grid.Row="1" Style="{StaticResource MaterialDesignFloatingHintTextBox}" materialDesign:HintAssist.Hint="{Tr LoginAgainDialog.PasswordBox}"></TextBox>
-        <ComboBox Grid.Row="2" Margin="10,10,10,0" materialDesign:HintAssist.Hint="{Tr Common.Proxy}" ItemsSource="{Binding Proxies}" SelectedItem="{Binding SelectedProxy}" >
+        <ComboBox   ToolTip="{Tr LoginAgainDialog.ProxyToolTip}" Grid.Row="2" Margin="10,18,10,0" materialDesign:HintAssist.Hint="{Tr Common.Proxy}" ItemsSource="{Binding Proxies}" SelectedItem="{Binding SelectedProxy}" >
             <ItemsControl.ItemTemplate>
                 <DataTemplate DataType="{x:Type entities:MaProxy}">
                     <TextBlock Text="{Binding Converter={StaticResource ProxyTextConverter}, Mode=OneWay}" />
                 </DataTemplate>
-            </ItemsControl.ItemTemplate> 
+            </ItemsControl.ItemTemplate>
+            <UIElement.InputBindings>
+                <KeyBinding Key="Delete" Command="{Binding RemoveProxyCommand}" />
+            </UIElement.InputBindings>
         </ComboBox>
         <CheckBox Grid.Row="3"  Margin="10,10,10,0"  IsEnabled="{Binding Source={x:Static model:PHandler.IsPasswordSet}}" IsChecked="{Binding SavePassword}" Content="{Tr LoginAgainDialog.SaveEncryptedPassword}"/>
         <CheckBox Grid.Row="4" Margin="10,10,10,0" IsEnabled="{Binding  MafileHasProxy}" Content="{Tr LoginAgainDialog.UseMafileProxy}" IsChecked="{Binding UseMafileProxy}"/>
-        <Grid Grid.Row="5" Margin="10,0,10,0">
+        <Grid Grid.Row="5" Margin="10,10,10,0">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition/>
                 <ColumnDefinition/>
diff --git a/NebulaAuth/View/ProxyManagerView.xaml b/NebulaAuth/View/ProxyManagerView.xaml
index 31f373e..313f3cf 100644
--- a/NebulaAuth/View/ProxyManagerView.xaml
+++ b/NebulaAuth/View/ProxyManagerView.xaml
@@ -21,7 +21,7 @@
         </Style>
     </d:DesignerProperties.DesignStyle>
 
-    <Grid Margin="15,10,15,15">
+    <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="Auto"/>
@@ -34,8 +34,8 @@
                <ColumnDefinition/>
                <ColumnDefinition/>
            </Grid.ColumnDefinitions>
-            <TextBlock FontStyle="Normal" Foreground="DarkGray" HorizontalAlignment="Left" VerticalAlignment="Center" FontSize="18" Text="{Tr ProxyManagerDialog.Title}"/>
-            <Button IsCancel="True" Grid.Column="1" Width="30" Height="30" Style="{StaticResource MaterialDesignIconForegroundButton}" HorizontalAlignment="Right" Command="{x:Static md:DialogHost.CloseDialogCommand}">
+            <TextBlock Margin="10" FontStyle="Normal" Foreground="DarkGray" HorizontalAlignment="Left" VerticalAlignment="Center" FontSize="18" Text="{Tr ProxyManagerDialog.Title}"/>
+            <Button Margin="0,0,10,0" IsCancel="True" Grid.Column="1" Width="30" Height="30" Style="{StaticResource MaterialDesignIconForegroundButton}" HorizontalAlignment="Right" Command="{x:Static md:DialogHost.CloseDialogCommand}">
                <md:PackIcon Kind="Close" Width="24" Height="24" Foreground="IndianRed"></md:PackIcon>
            </Button>
            
@@ -51,8 +51,9 @@
                        Margin="15" FontSize="16">
                 <Run  Text="{Tr ProxyManagerDialog.DefaultProxy, IsDynamic=False}"/>
                 <Run Text="{Binding DefaultProxy.Key, StringFormat='&#x0a;0:', FallbackValue='X', Mode=OneWay}"/>
-                <Run Text="{Binding DefaultProxy.Value.Address, Mode=OneWay, FallbackValue=''}"/>
+                <Run Text="{Binding DefaultProxy.Value, Converter='{StaticResource ProxyDataTextConverter}', Mode=OneWay, FallbackValue=''}"/>
             </TextBlock>
+
             <Button Grid.Column="1"  Command="{Binding SetDefaultCommand}">
                 <md:PackIcon Kind="HeartBoxOutline" Width="20" Height="20"></md:PackIcon>
             </Button>
@@ -61,7 +62,7 @@
             </Button>
         </Grid>
         <md:Card Grid.Row="3" Margin="10">
-            <ListBox  SelectedValue="{Binding SelectedProxy}" ItemsSource="{Binding Proxies}">
+            <ListBox FontSize="14"  SelectedValue="{Binding SelectedProxy}" ItemsSource="{Binding Proxies}">
                 <ListBox.ItemContainerStyle>
                     <Style TargetType="ListBoxItem" BasedOn="{StaticResource MaterialDesignListBoxItem}">
                         <Setter Property="Tag" Value="{Binding RelativeSource={RelativeSource AncestorType=UserControl}, Path=DataContext}"/>
@@ -85,7 +86,7 @@
                     <DataTemplate>
                         <TextBlock>
                             <Run Text="{Binding Key, Mode=OneWay}"/><Run Text=": "/>
-                            <Run Text="{Binding Value.Address, Mode=OneWay}"/>
+                            <Run Text="{Binding Value, Mode=OneWay, Converter={StaticResource ProxyDataTextConverter}}"/>
 
                         </TextBlock>
                     </DataTemplate>
diff --git a/NebulaAuth/ViewModel/MainVM.cs b/NebulaAuth/ViewModel/MainVM.cs
index ce1f75a..3ced846 100644
--- a/NebulaAuth/ViewModel/MainVM.cs
+++ b/NebulaAuth/ViewModel/MainVM.cs
@@ -46,7 +46,7 @@ public partial class MainVM : ObservableObject
         {
             SnackbarController.SendSnackbar(
                 GetLocalizationOrDefault("DuplicateMafilesFound") + " " + Storage.DuplicateFound,
-                TimeSpan.FromSeconds(3));
+                TimeSpan.FromSeconds(4));
         }
     }
 
diff --git a/NebulaAuth/ViewModel/MainVM_Groups.cs b/NebulaAuth/ViewModel/MainVM_Groups.cs
index 8005e89..6b7b767 100644
--- a/NebulaAuth/ViewModel/MainVM_Groups.cs
+++ b/NebulaAuth/ViewModel/MainVM_Groups.cs
@@ -5,6 +5,7 @@ using NebulaAuth.Model.Entities;
 using System;
 using System.Collections.ObjectModel;
 using System.Linq;
+using System.Threading.Tasks;
 
 namespace NebulaAuth.ViewModel;
 
@@ -47,6 +48,8 @@ public partial class MainVM //Groups
         var mafile = SelectedMafile;
         if (mafile == null) return;
         if (string.IsNullOrEmpty(value)) return;
+        if (!ValidateCanSaveAndWarn(mafile)) return;
+
         mafile.Group = value;
         Storage.UpdateMafile(mafile);
         QueryGroups();
@@ -60,10 +63,12 @@ public partial class MainVM //Groups
     {
         if (value == null) return;
         if (value.Length < 2) return;
+
         var group = (string?)value[0];
         var mafile = (Mafile?)value[1];
 
         if (group == null || mafile == null) return;
+        if (!ValidateCanSaveAndWarn(mafile)) return;
         mafile.Group = group;
         Storage.UpdateMafile(mafile);
         QueryGroups();
@@ -75,6 +80,7 @@ public partial class MainVM //Groups
     private void RemoveGroup(Mafile? mafile)
     {
         if (mafile?.Group == null) return;
+        if (!ValidateCanSaveAndWarn(mafile)) return;
         var mafGroup = mafile.Group;
         mafile.Group = null;
         Storage.UpdateMafile(mafile);
@@ -125,11 +131,7 @@ public partial class MainVM //Groups
         }
         var perform = query.ToList();
         MaFiles = new ObservableCollection<Mafile>(perform);
-        if (SelectedMafile != null && !MaFiles.Contains(SelectedMafile))
-        {
-            SelectedMafile = MaFiles.FirstOrDefault();
-        }
-
+        SelectedMafile = MaFiles.FirstOrDefault();
         return;
 
         bool SearchPredicate(Mafile mafile)
diff --git a/NebulaAuth/ViewModel/MainVM_Proxy.cs b/NebulaAuth/ViewModel/MainVM_Proxy.cs
index 8bd7936..85a2ff5 100644
--- a/NebulaAuth/ViewModel/MainVM_Proxy.cs
+++ b/NebulaAuth/ViewModel/MainVM_Proxy.cs
@@ -98,7 +98,9 @@ public partial class MainVM
     [RelayCommand]
     private void RemoveProxy()
     {
+        if(SelectedProxy == null) return;
         if (SelectedMafile == null) return;
+        if (!ValidateCanSaveAndWarn(SelectedMafile)) return;
         SelectedMafile.Proxy = null;
         SelectedProxy = null;
         Storage.UpdateMafile(SelectedMafile);
@@ -114,8 +116,19 @@ public partial class MainVM
         }
 
         if (SelectedMafile == null) return;
+        if (!ValidateCanSaveAndWarn(SelectedMafile)) return;
         ProxyExist = true;
         SelectedMafile.Proxy = SelectedProxy;
         Storage.UpdateMafile(SelectedMafile);
     }
+        
+    private bool ValidateCanSaveAndWarn(Mafile data)
+    {
+        var canSave = Storage.ValidateCanSave(data);
+        if (!canSave)
+        {
+            SnackbarController.SendSnackbar(GetLocalizationOrDefault("CantRetrieveSteamIDToUpdate"));
+        }
+        return canSave;
+    }
 }
\ No newline at end of file
diff --git a/NebulaAuth/ViewModel/MainVM_Timer.cs b/NebulaAuth/ViewModel/MainVM_Timer.cs
index f16a99e..2f8c7c4 100644
--- a/NebulaAuth/ViewModel/MainVM_Timer.cs
+++ b/NebulaAuth/ViewModel/MainVM_Timer.cs
@@ -136,5 +136,6 @@ public partial class MainVM //Timer
         _timerCheckSeconds = value;
         OnPropertyChanged(nameof(TimerCheckSeconds));
         _confirmTimer.Change(value * 1000, value * 1000);
+        SnackbarController.SendSnackbar(GetLocalizationOrDefault("TimerChanged"));
     }
 }
\ No newline at end of file
diff --git a/NebulaAuth/ViewModel/Other/LoginAgainOnImportVM.cs b/NebulaAuth/ViewModel/Other/LoginAgainOnImportVM.cs
index a5e9c86..ec99415 100644
--- a/NebulaAuth/ViewModel/Other/LoginAgainOnImportVM.cs
+++ b/NebulaAuth/ViewModel/Other/LoginAgainOnImportVM.cs
@@ -2,6 +2,8 @@
 using NebulaAuth.Model.Entities;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.Windows.Forms;
+using CommunityToolkit.Mvvm.Input;
 
 namespace NebulaAuth.ViewModel.Other;
 
@@ -51,4 +53,10 @@ public partial class LoginAgainOnImportVM : ObservableObject
 
     public LoginAgainOnImportVM()
     { }
+
+    [RelayCommand]
+    private void RemoveProxy()
+    {
+        SelectedProxy = null;
+    }
 }
\ No newline at end of file
diff --git a/NebulaAuth/ViewModel/Other/ProxyManagerVM.cs b/NebulaAuth/ViewModel/Other/ProxyManagerVM.cs
index ba668e1..7a562f0 100644
--- a/NebulaAuth/ViewModel/Other/ProxyManagerVM.cs
+++ b/NebulaAuth/ViewModel/Other/ProxyManagerVM.cs
@@ -1,5 +1,7 @@
 using AchiesUtilities.Collections;
 using AchiesUtilities.Web.Proxy;
+using AutoUpdaterDotNET;
+using CodingSeb.Localization.WPF;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using NebulaAuth.Core;
@@ -56,9 +58,8 @@ public partial class ProxyManagerVM : ObservableObject
 
 
 
-                try
+                if (ProxyStorage.DefaultScheme.TryParse(str, out var proxy))
                 {
-                    var proxy = ProxyData.Parse(str, ProxyStorage.FORMAT);
                     if (id != null && proxies.Any(kvp => kvp.Key == id))
                     {
                         SnackbarController.SendSnackbar(string.Format(GetLocalizationOrDefault("DuplicateId"), id));
@@ -66,7 +67,7 @@ public partial class ProxyManagerVM : ObservableObject
                     }
                     proxies.Add(new KeyValuePair<int?, ProxyData>(id, proxy));
                 }
-                catch (FormatException)
+                else
                 {
                     SnackbarController.SendSnackbar(string.Format(GetLocalizationOrDefault("WrongFormatOnLine"), i));
                     return;
@@ -88,20 +89,15 @@ public partial class ProxyManagerVM : ObservableObject
                 input = IdRegex.Replace(input, "");
             }
 
-            ProxyData data;
-            try
+            if (ProxyStorage.DefaultScheme.TryParse(input, out var data))
             {
-                data = ProxyData.Parse(input, ProxyStorage.FORMAT);
+                ProxyStorage.SetProxy(id, data);
             }
-            catch (FormatException)
+            else
             {
                 SnackbarController.SendSnackbar(GetLocalizationOrDefault("WrongFormat"));
                 return;
             }
-
-            ProxyStorage.SetProxy(id, data);
-
-
         }
         AddProxyField = string.Empty;
         CheckIfDefaultProxyStay();
@@ -140,10 +136,18 @@ public partial class ProxyManagerVM : ObservableObject
     }
 
     [RelayCommand]
-    private void CopyProxy(ProxyData? obj)
+    private void CopyProxy(ProxyData? data)
     {
-        if (obj == null) return;
-        Clipboard.SetText(obj.ToString(ProxyStorage.FORMAT));
+        if (data == null) return;
+        try
+        {
+            Clipboard.SetText(ProxyStorage.GetProxyString(data));
+        }
+        catch (Exception ex)
+        {
+            Shell.Logger.Error(ex);
+        }
+       
     }
 
     [RelayCommand]
diff --git a/NebulaAuth/localization.loc.json b/NebulaAuth/localization.loc.json
index 1e7c297..4de10cf 100644
--- a/NebulaAuth/localization.loc.json
+++ b/NebulaAuth/localization.loc.json
@@ -132,6 +132,11 @@
         "ru": "Группы",
         "ua": "Групи"
       },
+      "GroupToolTip": {
+        "ru": "Введите новую группу и нажмите Enter. Управление группой - ПКМ на аккаунте",
+        "en": "Enter new group and press Enter. Group management - RMB on account",
+        "ua": "Введіть нову групу і натисніть Enter. Управління групою - ПКМ на акаунті"
+      },
       "Proxy": {
         "ProxyHint": {
           "en": "Proxy",
@@ -143,6 +148,11 @@
           "ru": "Открыть менеджер прокси",
           "ua": "Відкрити менеджер проксі"
         },
+        "ProxyManipulateToolTip": {
+          "en": "Right-click to open menu. DEL to remove",
+          "ru": "Правый клик для открытия меню. DEL для удаления",
+          "ua": "Правий клік для відкриття меню. DEL для видалення"
+        },
         "ProxyAlert": {
           "DefaultInUse": {
             "en": "Default proxy is in use",
@@ -156,7 +166,6 @@
           }
         }
       },
-
       "TradeTimerHint": {
         "en": "Trade",
         "ru": "Трейд",
@@ -369,7 +378,12 @@
       "en": "Use mafile proxy",
       "ru": "Использовать прокси из мафайла",
       "ua": "Використовувати проксі з мафайла"
-    }
+    },
+    "ProxyToolTip": {
+      "en": "Press 'DEL' to remove",
+      "ru": "Нажмите 'DEL' для удаления",
+      "ua": "Натисніть 'DEL' для видалення"
+    } 
   },
   "ProxyManagerDialog": {
     "Title": {
@@ -381,8 +395,12 @@
       "en": "Default proxy:",
       "ru": "Прокси по умолчанию:",
       "ua": "Проксі за замовчуванням:"
+    },
+    "UseRandomDefaultProxy": {
+      "en": "Use random default proxy",
+      "ru": "Cлучайный прокси по умолчанию",
+      "ua": "Випадковий проксі за замовчуванням"
     }
-
   },
   "WaitLoginDialog": {
     "Text": {
@@ -596,7 +614,17 @@
         "en": "Duplicate mafile(s) found and were not loaded. Check log to get lists of duplicate files.",
         "ru": "Найдены дубликаты мафайлов, они не были загружены. Проверьте лог чтобы получить списки дубликатов.",
         "ua": "Знайдено дублікати мафайлів, вони не були завантажені. Перевірте лог щоб отримати списки дублікатів."
-      }
+      },
+      "TimerChanged": {
+        "en": "Timer changed",
+        "ru": "Таймер изменен",
+        "ua": "Таймер змінено"
+      },
+      "CantRetrieveSteamIDToUpdate": {
+        "ru": "Не удалось получить SteamID из мафайла и сохранить изменения. Необходимо сделать релогин. Отменено",
+        "en": "Can't retrieve SteamID from mafile to save changes. Need to relogin. Canceled",
+        "ua": "Не вдалося отримати SteamID з мафайла та зберегти зміни. Потрібно зробити релогін. Скасовано"
+      } 
     },
     "ErrorTranslator": {
       "Login": {
diff --git a/NebulaAuth/update.xml b/NebulaAuth/update.xml
index 4961c78..7c6fcf6 100644
--- a/NebulaAuth/update.xml
+++ b/NebulaAuth/update.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-	<version>1.4.7.0</version>
-	<url>https://github.com/achiez/NebulaAuth-Steam-Desktop-Authenticator-by-Achies/releases/download/1.4.7/NebulaAuth.1.4.7.zip</url>
-	<changelog>https://achiez.github.io/NebulaAuth-Steam-Desktop-Authenticator-by-Achies/changelog/1.4.7.html</changelog>
+	<version>1.4.8.0</version>
+	<url>https://github.com/achiez/NebulaAuth-Steam-Desktop-Authenticator-by-Achies/releases/download/1.4.8/NebulaAuth.1.4.8.zip</url>
+	<changelog>https://achiez.github.io/NebulaAuth-Steam-Desktop-Authenticator-by-Achies/changelog/1.4.8.html</changelog>
 	<mandatory>false</mandatory>
 </item>
\ No newline at end of file
diff --git a/SteamLibForked/Authentication/AdmissionHelper.cs b/SteamLibForked/Authentication/AdmissionHelper.cs
index 70c5884..353d37e 100644
--- a/SteamLibForked/Authentication/AdmissionHelper.cs
+++ b/SteamLibForked/Authentication/AdmissionHelper.cs
@@ -14,6 +14,7 @@ public static class AdmissionHelper
     public const string ACCESS_COOKIE_NAME = "steamLoginSecure";
     public const string REFRESH_COOKIE_NAME = "steamRefresh_steam";
     public const string LANGUAGE_COOKIE_NAME = "Steam_Language";
+    public const string SESSION_ID_COOKIE_NAME = "sessionid";
 
     #region Main
 
@@ -28,8 +29,8 @@ public static class AdmissionHelper
         AddRefreshToken(container, sessionData.RefreshToken);
 
         var community = SteamDomains.GetDomainUri(SteamDomain.Community);
-        container.Add(community, new Cookie("sessionid", sessionData.SessionId, "/"));
-        container.Add(community, new Cookie("Steam_Language", setLanguage, "/"));
+        container.Add(community, new Cookie(SESSION_ID_COOKIE_NAME, sessionData.SessionId, "/"));
+        container.Add(community, new Cookie(LANGUAGE_COOKIE_NAME, setLanguage, "/"));
         TransferCommunityCookies(container);
         foreach (var domain in SteamDomains.AllDomains)
         {
@@ -65,8 +66,8 @@ public static class AdmissionHelper
 
         var community = SteamDomains.GetDomainUri(SteamDomain.Community);
         container.Add(community, new Cookie("steamid", mobileSession.SteamId.Steam64.ToString()));
-        container.Add(community, new Cookie("sessionid", mobileSession.SessionId));
-        container.Add(community, new Cookie("Steam_Language", setLanguage));
+        container.Add(community, new Cookie(SESSION_ID_COOKIE_NAME, mobileSession.SessionId));
+        container.Add(community, new Cookie(LANGUAGE_COOKIE_NAME, setLanguage));
         TransferCommunityCookies(container);
 
         foreach (var domain in SteamDomains.AllDomains)
@@ -91,8 +92,8 @@ public static class AdmissionHelper
 
         var community = SteamDomains.GetDomainUri(SteamDomain.Community);
         container.Add(community, new Cookie("steamid", mobileSession.SteamId.Steam64.ToString()));
-        container.Add(community, new Cookie("sessionid", mobileSession.SessionId));
-        container.Add(community, new Cookie("Steam_Language", setLanguage));
+        container.Add(community, new Cookie(SESSION_ID_COOKIE_NAME, mobileSession.SessionId));
+        container.Add(community, new Cookie(LANGUAGE_COOKIE_NAME, setLanguage));
         TransferCommunityCookies(container);
 
         var domainCookieSet = false;
@@ -154,10 +155,15 @@ public static class AdmissionHelper
             if (cookie.Domain.Contains("steamcommunity.com") == false || cookie.Expired || cookie.Name.EqualsIgnoreCase(ACCESS_COOKIE_NAME)) continue;
 
 
-            container.Add(SteamDomains.GetDomainUri(SteamDomain.Store), new Cookie(cookie.Name, cookie.Value, cookie.Path) { Expires = cookie.Expires, Secure = cookie.Secure, HttpOnly = cookie.HttpOnly });
-            container.Add(SteamDomains.GetDomainUri(SteamDomain.Help), new Cookie(cookie.Name, cookie.Value, cookie.Path) { Expires = cookie.Expires, Secure = cookie.Secure, HttpOnly = cookie.HttpOnly });
-            container.Add(SteamDomains.GetDomainUri(SteamDomain.TV), new Cookie(cookie.Name, cookie.Value, cookie.Path) { Expires = cookie.Expires, Secure = cookie.Secure, HttpOnly = cookie.HttpOnly });
+            container.Add(SteamDomains.GetDomainUri(SteamDomain.Store), CloneCookie(cookie));
+            container.Add(SteamDomains.GetDomainUri(SteamDomain.Help), CloneCookie(cookie));
+            container.Add(SteamDomains.GetDomainUri(SteamDomain.TV), CloneCookie(cookie));
         }
+
+        return;
+
+        static Cookie CloneCookie(Cookie cookie) 
+            => new(cookie.Name, cookie.Value, cookie.Path) { Expires = cookie.Expires, Secure = cookie.Secure, HttpOnly = cookie.HttpOnly };
     }
 
     public static void AddRefreshToken(CookieContainer container, SteamAuthToken token)
@@ -198,7 +204,7 @@ public static class AdmissionHelper
     {
         var cookies = container.GetAllCookies();
         return cookies
-            .FirstOrDefault(c => c.Name.Equals("sessionid", StringComparison.InvariantCultureIgnoreCase)
+            .FirstOrDefault(c => c.Name.Equals(SESSION_ID_COOKIE_NAME, StringComparison.InvariantCultureIgnoreCase)
                                  && c.Expired == false
                                  && c.Domain.Contains(domain, StringComparison.InvariantCultureIgnoreCase))?
             .Value;
diff --git a/SteamLibForked/Utility/MaFiles/MafileSerializer_SessionData.cs b/SteamLibForked/Utility/MaFiles/MafileSerializer_SessionData.cs
index bdbac5f..2a3cc56 100644
--- a/SteamLibForked/Utility/MaFiles/MafileSerializer_SessionData.cs
+++ b/SteamLibForked/Utility/MaFiles/MafileSerializer_SessionData.cs
@@ -36,11 +36,6 @@ public partial class MafileSerializer //SessionData
             return null;
         }
 
-        if (refreshToken.IsExpired || refreshToken.Type != SteamAccessTokenType.MobileRefresh)
-        {
-            result = DeserializedMafileSessionResult.Expired;
-            return null;
-        }
 
         var sessionId = GetString(j, "sessionid", "session_id", "session");
         var accessTokenToken = GetToken(j, "accesstoken", "access_token", "access");
@@ -75,7 +70,16 @@ public partial class MafileSerializer //SessionData
         sessionData.IsValid = SessionDataValidator.Validate(null, sessionData).Succeeded;
         if(sessionData.IsValid == false)
             return null;
-        result = DeserializedMafileSessionResult.Valid;
+
+        if (refreshToken.IsExpired || refreshToken.Type != SteamAccessTokenType.MobileRefresh)
+        {
+            result = DeserializedMafileSessionResult.Expired;
+        }
+        else
+        {
+            result = DeserializedMafileSessionResult.Valid;
+        }
+
         return sessionData;
     }
 }
\ No newline at end of file
diff --git a/changelog/1.4.8.html b/changelog/1.4.8.html
new file mode 100644
index 0000000..77fd2b0
--- /dev/null
+++ b/changelog/1.4.8.html
@@ -0,0 +1,84 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Changelog</title>
+    <style>
+        body {
+            font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
+            background-color: #eeeeee;
+            color: #333;
+            line-height: 1.6;
+        }
+
+        .changelog-container {
+            background-color: #fff;
+            border-radius: 10px;
+            padding: 25px;
+            margin: 25px auto;
+            max-width: 800px;
+            box-shadow: 0 5px 15px rgba(0,0,0,0.2);
+        }
+
+        .change {
+            margin-bottom: 20px;
+            padding: 0;
+            border-left: 4px solid #a50ec7;
+            background-color: #f9f9f9;
+        }
+
+        .version {
+            font-weight: 600;
+            font-size: 1.5em;
+            color: #a50ec7;
+            margin-left: 10px;
+        }
+
+        .date {
+            font-style: italic;
+            color: #888;
+            margin-bottom: 10px;
+            margin-left: 15px;
+        }
+
+        .description {
+            font-size: 1em;
+            padding: 0 15px;
+        }
+
+            .description ul {
+                list-style: inside square;
+                padding: 0;
+            }
+
+        @media only screen and (max-width: 600px) {
+            .changelog-container {
+                width: 90%;
+                margin: 25px auto;
+                padding: 25px;
+            }
+        }
+    </style>
+</head>
+<body>
+
+<div class="changelog-container">
+    <!-- Changelog entry -->
+    <div class="change">
+        <div class="version">Version 1.4.8</div>
+        <div class="date">DATE</div>
+        <div class="description">
+            - Fixed crash when attempting to update/save mafile without SessionData on proxy and group change<br/>
+            - The account found through the search will be selected automatically<br>
+            - Added proxy support types: without authentication (no user and password), domain proxy (localhost, mydomain.com), with "http://" scheme<br>
+            - Added "Timer changed" snackbar to indicate that preferences was updated<br>
+            - Now the port is visible in the proxy text<br>
+            - Few tooltips added on "Groups" and "Proxy" fields"<br/>
+            - Small UI improvements<br/>
+        </div>
+    </div>
+</div>
+
+</body>
+</html>
\ No newline at end of file