v0.1.27更新

Author: wherewhere

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -33,6 +33,7 @@ body:
       label: App version
       description: Specify the version of APK Installer you're using.
       options:
+        - "0.1.27"
         - "0.1.26"
         - "0.1.25"
         - "0.1.24"

APKInstaller/APKInstaller/APKInstaller.csproj

@@ -21,18 +21,20 @@
     <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
     <TrimMode>partial</TrimMode>
     <UseWinUI>True</UseWinUI>
-    <VersionPrefix>0.1.26</VersionPrefix>
+    <VersionPrefix>0.1.27</VersionPrefix>
   </PropertyGroup>
 
   <PropertyGroup>
     <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
     <AppxBundle>Never</AppxBundle>
     <AppxBundlePlatforms>x64</AppxBundlePlatforms>
     <AppxPackageDir>AppPackages</AppxPackageDir>
+    <AppxPackageSigningEnabled>False</AppxPackageSigningEnabled>
+    <AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
     <AppxSymbolPackageEnabled>True</AppxSymbolPackageEnabled>
     <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
     <GenerateTemporaryStoreCertificate>True</GenerateTemporaryStoreCertificate>
-    <GenerateTestArtifacts>False</GenerateTestArtifacts>
+    <GenerateTestArtifacts>True</GenerateTestArtifacts>
     <HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
   </PropertyGroup>
 
@@ -81,10 +83,6 @@
     <HasPackageAndPublishMenu>true</HasPackageAndPublishMenu>
   </PropertyGroup>
 
-  <ItemGroup>
-    <None Remove="favicon.ico" />
-  </ItemGroup>
-
   <ItemGroup>
     <COMReference Include="IWshRuntimeLibrary">
       <WrapperTool>tlbimp</WrapperTool>

APKInstaller/APKInstaller/Package.appxmanifest

@@ -11,7 +11,7 @@
   <Identity
     Name="18184wherewhere.AndroidAppInstaller"
     Publisher="CN=2C3A37C0-35FC-4839-B08C-751C1C1AFBF5"
-    Version="0.1.26.0" />
+    Version="0.1.27.0" />
 
   <Properties>
     <DisplayName>APK 安装程序</DisplayName>

APKInstaller/APKInstaller/Strings/en-US/Resources.resw

@@ -127,7 +127,7 @@
     <value>An Android App Installer. Written by @wherewhere and @Tangent-90.</value>
   </data>
   <data name="AppName" xml:space="preserve">
-    <value>App Installer for Mobile</value>
+    <value>App Installer (Mobile)</value>
   </data>
   <data name="ExceptionThrown" xml:space="preserve">
     <value>There was an error with the program…</value>

APKInstaller/APKInstaller/ViewModels/InstallViewModel.cs

@@ -752,14 +752,14 @@ public async Task InitADBFile()
                     {
                         XamlRoot = _page?.XamlRoot,
                         Title = _loader.GetString("ADBMissing"),
-                        PrimaryButtonText = _loader.GetString("Download"),
+                        //PrimaryButtonText = _loader.GetString("Download"),
                         SecondaryButtonText = _loader.GetString("Select"),
                         CloseButtonText = _loader.GetString("Cancel"),
                         Content = new ScrollViewer
                         {
                             Content = StackPanel
                         },
-                        DefaultButton = ContentDialogButton.Primary
+                        DefaultButton = ContentDialogButton.Secondary
                     };
                     ProgressHelper.SetState(ProgressState.None, true);
                     ContentDialogResult result = await dialog.ShowAsync();
@@ -794,6 +794,7 @@ public async Task InitADBFile()
                                 }
                                 else
                                 {
+                                    await ReinitializeUI();
                                     return;
                                 }
                             }
@@ -818,6 +819,7 @@ public async Task InitADBFile()
                             }
                             else
                             {
+                                await ReinitializeUI();
                                 return;
                             }
                         }
@@ -837,15 +839,19 @@ public async Task InitADBFile()
                         }
 
                         StorageFile file = await FileOpen.PickSingleFileAsync();
-                        if (file != null)
+                        if (file == null)
+                        {
+                            goto checkadb;
+                        }
+                        else
                         {
                             ADBPath = file.Path;
                         }
                     }
                     else
                     {
                         SendResults(new Exception(_loader.GetString("ADBMissing")));
-                        Application.Current.Exit();
+                        await ReinitializeUI();
                         return;
                     }
                 }
@@ -1285,11 +1291,6 @@ private async Task ReinitializeUI()
             WaitProgressText = _loader.GetString("Loading");
             if ((!string.IsNullOrWhiteSpace(_path) || _url != null) && NetAPKExist)
             {
-                if (!IsADBReady)
-                {
-                    ResetUI();
-                    return;
-                }
                 checkdevice:
                 if (await CheckDevice() && _device != null)
                 {