From fa33bd533ff16826fbc7bb69426dc3dd0422d5a6 Mon Sep 17 00:00:00 2001
From: rmbgame <rmb@rmbgame.net>
Date: Mon, 12 Jul 2021 12:37:35 +0800
Subject: [PATCH] fix asf login disconnected

---
 references/ArchiSteamFarm                     |   2 +-
 .../UI/Views/Windows/FluentWindow.cs          |   3 +-
 .../Windows/LocalAuthPage/AddAuthWindow.axaml |   2 +-
 .../ST.Client.Desktop.Avalonia.csproj         | 102 +++++++++---------
 .../Services/Mvvm/ASFService.cs               |   2 +-
 .../Pages/LocalAuthPageViewModel.shared.cs    |   2 +-
 6 files changed, 57 insertions(+), 56 deletions(-)

diff --git a/references/ArchiSteamFarm b/references/ArchiSteamFarm
index 6ac5ab83d..9c619480e 160000
--- a/references/ArchiSteamFarm
+++ b/references/ArchiSteamFarm
@@ -1 +1 @@
-Subproject commit 6ac5ab83d7e8a5f9489ec1ae74226960189ee18a
+Subproject commit 9c619480e75e64ea82798c4b2f1adbe38c9ea95f
diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/FluentWindow.cs b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/FluentWindow.cs
index ec17430ad..86b7d30b5 100644
--- a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/FluentWindow.cs
+++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/FluentWindow.cs
@@ -165,7 +165,8 @@ namespace Avalonia.Controls
             if (isSaveStatus)
             {
                 this.Opened += FluentWindow_Opened;
-                this.PositionChanged += FluentWindow_PositionChanged;
+                if (this.CanResize)
+                    this.PositionChanged += FluentWindow_PositionChanged;
             }
         }
 
diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/LocalAuthPage/AddAuthWindow.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/LocalAuthPage/AddAuthWindow.axaml
index 8c5acb8f3..fecde7359 100644
--- a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/LocalAuthPage/AddAuthWindow.axaml
+++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/LocalAuthPage/AddAuthWindow.axaml
@@ -10,7 +10,7 @@
         xmlns:controls="clr-namespace:System.Application.UI.Views.Controls"
         xmlns:ms="clr-namespace:System.Application.Models.Settings;assembly=System.Application.SteamTools.Client.Desktop"
         FontFamily="{Binding Source={x:Static ms:UISettings.FontName},Path=Value, Mode=OneWay,Converter={StaticResource NameToFontFamilyConverter}}"
-        Width="800" Height="600"
+        MinWidth="800" MinHeight="600"
         WindowStartupLocation="CenterOwner"
         ExtendClientAreaTitleBarHeightHint="30"
         Background="Transparent"
diff --git a/src/ST.Client.Desktop.Avalonia/ST.Client.Desktop.Avalonia.csproj b/src/ST.Client.Desktop.Avalonia/ST.Client.Desktop.Avalonia.csproj
index 93a9d7f1d..5c68e5971 100644
--- a/src/ST.Client.Desktop.Avalonia/ST.Client.Desktop.Avalonia.csproj
+++ b/src/ST.Client.Desktop.Avalonia/ST.Client.Desktop.Avalonia.csproj
@@ -1,61 +1,61 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
-    <RootNamespace>System</RootNamespace>
-    <SignAssembly>false</SignAssembly>
-    <!--(SignAssembly)对此程序集进行签名会导致编译失败(CompileAvaloniaXamlTask)-->
-    <AssemblyName>System.Application.SteamTools.Client.Desktop.Avalonia</AssemblyName>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
+    <PropertyGroup>
+        <TargetFramework>net5.0</TargetFramework>
+        <RootNamespace>System</RootNamespace>
+        <SignAssembly>false</SignAssembly>
+        <!--(SignAssembly)对此程序集进行签名会导致编译失败(CompileAvaloniaXamlTask)-->
+        <AssemblyName>System.Application.SteamTools.Client.Desktop.Avalonia</AssemblyName>
+        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Update="**\*.xaml.cs">
-      <DependentUpon>%(Filename)</DependentUpon>
-    </Compile>
-    <AvaloniaResource Include="**\*.xaml">
-      <SubType>Designer</SubType>
-    </AvaloniaResource>
-    <AvaloniaResource Include="Assets\**" />
-    <AvaloniaResource Include="Application\UI\Assets\**" />
-  </ItemGroup>
+    <ItemGroup>
+        <Compile Update="**\*.xaml.cs">
+            <DependentUpon>%(Filename)</DependentUpon>
+        </Compile>
+        <AvaloniaResource Include="**\*.xaml">
+            <SubType>Designer</SubType>
+        </AvaloniaResource>
+        <AvaloniaResource Include="Assets\**" />
+        <AvaloniaResource Include="Application\UI\Assets\**" />
+    </ItemGroup>
 
-  <ItemGroup>
-    <None Remove="Application\UI\Assets\Fonts\WenQuanYiMicroHei-01.ttf" />
-    <None Remove="Application\UI\Assets\movecross.png" />
-  </ItemGroup>
+    <ItemGroup>
+        <None Remove="Application\UI\Assets\Fonts\WenQuanYiMicroHei-01.ttf" />
+        <None Remove="Application\UI\Assets\movecross.png" />
+    </ItemGroup>
 
-  <ItemGroup>
-    <Compile Include="..\Common.CoreLib\Properties\AssemblyInfo.cs">
-      <Link>Properties\AssemblyInfo.cs</Link>
-    </Compile>
-    <Compile Include="..\Common.CoreLib\Properties\AssemblyInfo.Version.cs">
-      <Link>Properties\AssemblyInfo.Version.cs</Link>
-    </Compile>
-    <Compile Include="..\ST\Properties\InternalsVisibleTo.cs">
-      <Link>Properties\InternalsVisibleTo.cs</Link>
-    </Compile>
-  </ItemGroup>
+    <ItemGroup>
+        <Compile Include="..\Common.CoreLib\Properties\AssemblyInfo.cs">
+            <Link>Properties\AssemblyInfo.cs</Link>
+        </Compile>
+        <Compile Include="..\Common.CoreLib\Properties\AssemblyInfo.Version.cs">
+            <Link>Properties\AssemblyInfo.Version.cs</Link>
+        </Compile>
+        <Compile Include="..\ST\Properties\InternalsVisibleTo.cs">
+            <Link>Properties\InternalsVisibleTo.cs</Link>
+        </Compile>
+    </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\..\references\AvaloniaGif\AvaloniaGif\AvaloniaGif.csproj" />
-    <ProjectReference Include="..\Common.CoreLib\Common.CoreLib.csproj" />
-    <ProjectReference Include="..\ST.Client.Desktop\ST.Client.Desktop.csproj" />
-  </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\..\references\AvaloniaGif\AvaloniaGif\AvaloniaGif.csproj" />
+        <ProjectReference Include="..\Common.CoreLib\Common.CoreLib.csproj" />
+        <ProjectReference Include="..\ST.Client.Desktop\ST.Client.Desktop.csproj" />
+    </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Avalonia" Version="0.10.999-cibuild0014857-beta" />
-    <!--<PackageReference Include="Avalonia.AvaloniaEdit" Version="0.10.4" />-->
-    <PackageReference Include="Avalonia.Desktop" Version="0.10.999-cibuild0014857-beta" />
-    <PackageReference Include="Avalonia.Controls.DataGrid" Version="0.10.999-cibuild0014857-beta" />
-    <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.999-cibuild0014857-beta" />
-    <PackageReference Include="Avalonia.Xaml.Behaviors" Version="0.10.6" />
-    <PackageReference Include="CefNet.Avalonia" Version="90.6.21124.1851" />
-    <PackageReference Include="LibVLCSharp.Avalonia" Version="3.5.1" />
-  </ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="Avalonia" Version="0.10.999-cibuild0014927-beta" />
+        <!--<PackageReference Include="Avalonia.AvaloniaEdit" Version="0.10.4" />-->
+        <PackageReference Include="Avalonia.Desktop" Version="0.10.999-cibuild0014927-beta" />
+        <PackageReference Include="Avalonia.Controls.DataGrid" Version="0.10.999-cibuild0014927-beta" />
+        <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.999-cibuild0014927-beta" />
+        <PackageReference Include="Avalonia.Xaml.Behaviors" Version="0.10.6.3" />
+        <PackageReference Include="CefNet.Avalonia" Version="90.6.21124.1851" />
+        <PackageReference Include="LibVLCSharp.Avalonia" Version="3.5.1" />
+    </ItemGroup>
 
-  <ItemGroup Condition="'$(Configuration)'=='Debug'">
-    <PackageReference Include="Avalonia.Diagnostics" Version="0.10.999-cibuild0014857-beta" />
-  </ItemGroup>
+    <ItemGroup Condition="'$(Configuration)'=='Debug'">
+        <PackageReference Include="Avalonia.Diagnostics" Version="0.10.999-cibuild0014927-beta" />
+    </ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/src/ST.Client.Desktop/Services/Mvvm/ASFService.cs b/src/ST.Client.Desktop/Services/Mvvm/ASFService.cs
index 48fadc8c8..eaf1bbe3c 100644
--- a/src/ST.Client.Desktop/Services/Mvvm/ASFService.cs
+++ b/src/ST.Client.Desktop/Services/Mvvm/ASFService.cs
@@ -38,7 +38,7 @@ namespace System.Application.Services
         {
             SteamBotsSourceList = new SourceCache<Bot, string>(t => t.BotName);
 
-            InitASF();
+            //InitASF();
         }
 
         public async void InitASF()
diff --git a/src/ST.Client.Desktop/UI/ViewModels/Pages/LocalAuthPageViewModel.shared.cs b/src/ST.Client.Desktop/UI/ViewModels/Pages/LocalAuthPageViewModel.shared.cs
index 6a67f2abf..b1ed097f0 100644
--- a/src/ST.Client.Desktop/UI/ViewModels/Pages/LocalAuthPageViewModel.shared.cs
+++ b/src/ST.Client.Desktop/UI/ViewModels/Pages/LocalAuthPageViewModel.shared.cs
@@ -118,7 +118,7 @@ namespace System.Application.UI.ViewModels
         void AddAuthMenu_Click()
         {
             if (DI.DeviceIdiom == DeviceIdiom.Desktop && !AppSettings.IsOfficialChannelPackage) return;
-            IShowWindowService.Instance.Show<AddAuthWindowViewModel>(CustomWindow.AddAuth);
+            IShowWindowService.Instance.Show<AddAuthWindowViewModel>(CustomWindow.AddAuth,resizeMode:ResizeModeCompat.CanResize);
         }
 
         public void ShowAuthCode(MyAuthenticator auth)