diff --git a/3x-ui b/3x-ui
deleted file mode 160000
index 70b36517..00000000
--- a/3x-ui
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 70b365171f9b40b540be5bff1a9c8b7227a37ac6
diff --git a/v2rayN/ServiceLib/Global.cs b/v2rayN/ServiceLib/Global.cs
index 3feb753b..94a66fa5 100644
--- a/v2rayN/ServiceLib/Global.cs
+++ b/v2rayN/ServiceLib/Global.cs
@@ -4,7 +4,7 @@ public class Global
{
#region const
- public const string AppName = "shi2ray";
+ public const string AppName = "v2rayN";
public const string GithubUrl = "https://github.com";
public const string GithubApiUrl = "https://api.github.com/repos";
public const string GeoUrl = "https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/{0}.dat";
diff --git a/v2rayN/ServiceLib/Models/ConfigItems.cs b/v2rayN/ServiceLib/Models/ConfigItems.cs
index 252bcd34..eeb88deb 100644
--- a/v2rayN/ServiceLib/Models/ConfigItems.cs
+++ b/v2rayN/ServiceLib/Models/ConfigItems.cs
@@ -74,7 +74,6 @@ public class GUIItem
public int TrayMenuServersLimit { get; set; } = 20;
public bool EnableHWA { get; set; } = false;
public bool EnableLog { get; set; } = true;
- public bool PrivacyNoticeAccepted { get; set; }
}
[Serializable]
diff --git a/v2rayN/v2rayN/App.xaml.cs b/v2rayN/v2rayN/App.xaml.cs
index 56976a4a..ca56311b 100644
--- a/v2rayN/v2rayN/App.xaml.cs
+++ b/v2rayN/v2rayN/App.xaml.cs
@@ -18,7 +18,7 @@ public partial class App : Application
/// Open only one process
///
///
- protected override async void OnStartup(StartupEventArgs e)
+ protected override void OnStartup(StartupEventArgs e)
{
var exePathKey = Utils.GetMd5(Utils.GetExePath());
@@ -38,18 +38,6 @@ public partial class App : Application
return;
}
- if (AppManager.Instance.Config.GuiItem.PrivacyNoticeAccepted == false)
- {
- var window = new Views.PrivacyNoticeWindow();
- if (window.ShowDialog() != true)
- {
- Environment.Exit(0);
- return;
- }
- AppManager.Instance.Config.GuiItem.PrivacyNoticeAccepted = true;
- await ConfigHandler.SaveConfig(AppManager.Instance.Config);
- }
-
AppManager.Instance.InitComponents();
base.OnStartup(e);
}
diff --git a/v2rayN/v2rayN/Views/MainWindow.xaml b/v2rayN/v2rayN/Views/MainWindow.xaml
index 9ebf36b9..1c49ca24 100644
--- a/v2rayN/v2rayN/Views/MainWindow.xaml
+++ b/v2rayN/v2rayN/Views/MainWindow.xaml
@@ -10,7 +10,7 @@
xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
xmlns:view="clr-namespace:v2rayN.Views"
xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
- Title="shi2ray"
+ Title="v2rayN"
Width="1200"
Height="800"
MinWidth="800"
diff --git a/v2rayN/v2rayN/v2rayN.csproj b/v2rayN/v2rayN/v2rayN.csproj
index 01162b47..9654625d 100644
--- a/v2rayN/v2rayN/v2rayN.csproj
+++ b/v2rayN/v2rayN/v2rayN.csproj
@@ -8,9 +8,6 @@