remove package BrotliSharpLib & fix android

larthornl · Nov 26, 2021 · fd6591f · fd6591f
1 parent bc26071
commit fd6591f
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 17 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -99,7 +99,6 @@
 		<PackageVersion Include="Microsoft.Win32.Registry" Version="5.0.0" />
 		<PackageVersion Include="SQLitePCLRaw.bundle_green" Version="2.0.7" />
 		<PackageVersion Include="System.Security.Principal.Windows" Version="5.0.0" />
-		<PackageVersion Include="BrotliSharpLib" Version="0.3.3" />
 		<PackageVersion Include="System.Buffers" Version="4.5.1" />
 		<PackageVersion Include="System.Memory" Version="4.5.4" />
 		<PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.5.4" />

diff --git a/README.en.md b/README.en.md
@@ -182,7 +182,6 @@ Read what we [milestones](https://github.com/SteamTools-Team/SteamTools/mileston
 * [Hardcodet.NotifyIcon](https://github.com/HavenDV/Hardcodet.NotifyIcon.Wpf.NetCore)
 * [System.Reactive](https://github.com/dotnet/reactive)
 * [Titanium-Web-Proxy](https://github.com/justcoding121/Titanium-Web-Proxy)
-* [BrotliSharpLib](https://github.com/master131/BrotliSharpLib)
 * [Portable.BouncyCastle](https://github.com/novotnyllc/bc-csharp)
 * [Ninject](https://github.com/ninject/Ninject)
 * [log4net](https://github.com/apache/logging-log4net)

diff --git a/README.md b/README.md
@@ -202,7 +202,6 @@ OS                            | Version                 | Architectures     |
 * [Hardcodet.NotifyIcon](https://github.com/HavenDV/Hardcodet.NotifyIcon.Wpf.NetCore)
 * [System.Reactive](https://github.com/dotnet/reactive)
 * [Titanium-Web-Proxy](https://github.com/justcoding121/Titanium-Web-Proxy)
-* [BrotliSharpLib](https://github.com/master131/BrotliSharpLib)
 * [Portable.BouncyCastle](https://github.com/novotnyllc/bc-csharp)
 * [Ninject](https://github.com/ninject/Ninject)
 * [log4net](https://github.com/apache/logging-log4net)

diff --git a/references/ArchiSteamFarm b/references/ArchiSteamFarm
diff --git a/references/Titanium-Web-Proxy b/references/Titanium-Web-Proxy
diff --git a/src/ST.Client.Android/GoToPlatformPages.cs b/src/ST.Client.Android/GoToPlatformPages.cs
@@ -134,21 +134,28 @@ public static void StartActivity<TActivity, TViewModel>(Fragment fragment, TView
 
         public static void OpenFile(Context context, JFile apkFile, string mime)
         {
-            var sdkInt = (int)Build.VERSION.SdkInt;
-            var intent = new Intent(Intent.ActionView);
-            AndroidUri apkUri;
-            if (sdkInt >= (int)BuildVersionCodes.N) // 7.0 FileProvider
+            try
             {
-                apkUri = FileProvider.GetUriForFile(context, GetAuthority(context), apkFile);
-                intent.AddFlags(ActivityFlags.GrantReadUriPermission); // FLAG_GRANT_READ_URI_PERMISSION 添加这一句表示对目标应用临时授权该Uri所代表的文件
+                var sdkInt = (int)Build.VERSION.SdkInt;
+                var intent = new Intent(Intent.ActionView);
+                AndroidUri apkUri;
+                if (sdkInt >= (int)BuildVersionCodes.N) // 7.0 FileProvider
+                {
+                    apkUri = FileProvider.GetUriForFile(context, GetAuthority(context), apkFile);
+                    intent.AddFlags(ActivityFlags.GrantReadUriPermission); // FLAG_GRANT_READ_URI_PERMISSION 添加这一句表示对目标应用临时授权该Uri所代表的文件
+                }
+                else
+                {
+                    apkUri = AndroidUri.FromFile(apkFile)!;
+                }
+                intent.SetDataAndType(apkUri, mime);
+                intent.AddFlags(ActivityFlags.NewTask);
+                context.StartActivity(intent);
             }
-            else
+            catch
             {
-                apkUri = AndroidUri.FromFile(apkFile)!;
+
             }
-            intent.SetDataAndType(apkUri, mime);
-            intent.AddFlags(ActivityFlags.NewTask);
-            context.StartActivity(intent);
         }
 
         public static void InstallApk(Context context, JFile apkFile) => OpenFile(context, apkFile, MediaTypeNames.APK);

diff --git a/src/ST.Client.Android/UI/Activities/AboutActivity.cs b/src/ST.Client.Android/UI/Activities/AboutActivity.cs
@@ -57,7 +57,7 @@ protected override void OnCreate2(Bundle? savedInstanceState)
             binding!.tvDevelopers.TextFormatted = CreateDevelopers();
             binding!.tvBusinessCooperationContact.TextFormatted = CreateBusinessCooperationContact();
             binding!.tvOpenSourceLicensed.TextFormatted = CreateOpenSourceLicensed();
-            binding!.tvCopyright.Text = ViewModel.Copyright;
+            binding!.tvCopyright.Text = Copyright;
             //binding!.tvContributors.TextFormatted = CreateContributors();
 
             R.Subscribe(() =>