Detect already uninstalled apk and do not crash (closes #169)

Lauriethefish · Aug 18, 2024 · 018003e · 018003e
1 parent 5812e6c
commit 018003e
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 4 deletions.
diff --git a/QuestPatcher.Core/AndroidDebugBridge.cs b/QuestPatcher.Core/AndroidDebugBridge.cs
@@ -485,9 +485,32 @@ public async Task DownloadApk(string packageId, string destination)
             await DownloadFile(appPath, destination);
         }
 
-        public async Task UninstallApp(string packageId)
+        /// <summary>
+        /// Uninstalls the app with package ID <paramref name="packageId"/>, if an app with this ID exists.
+        /// </summary>
+        /// <param name="packageId">The package ID of the app to uninstall.</param>
+        /// <returns>True if the app existed and was uninstalled, false otherwise.</returns>
+        public async Task<bool> UninstallApp(string packageId)
         {
-            await RunCommand($"uninstall {packageId}");
+            // Allow exit code 1 as this is returned in the case of the app not being installed in the first place.
+            var output = await RunCommand($"uninstall {packageId}", 1);
+            if(output.ExitCode == 1)
+            {
+                // Check if the failure was due to the app being uninstalled already (this causes DELETE_FAILED_INTERNAL_ERROR, which is terrible design)
+                if (output.AllOutput.Contains("[DELETE_FAILED_INTERNAL_ERROR]"))
+                {
+                     return false;
+                }
+                else
+                {
+                    throw new AdbException("Received exit code 1 when uninstalling and was not because app was already uninstalled: "
+                        + output.AllOutput);
+                }
+            }
+            else
+            {
+                return true;
+            }
         }
 
         public async Task<bool> IsPackageInstalled(string packageId)

diff --git a/QuestPatcher.Core/InstallManager.cs b/QuestPatcher.Core/InstallManager.cs
@@ -277,7 +277,10 @@ public async Task RestoreObbBackup(string backupPath)
         /// <returns></returns>
         public async Task UninstallApp()
         {
-            await _debugBridge.UninstallApp(_config.AppId);
+            if(!await _debugBridge.UninstallApp(_config.AppId))
+            {
+                Log.Warning("APK was already uninstalled. QuestPatcher is (was) out of sync.");
+            }
             InstalledApp = null;
             _quit();
         }

diff --git a/QuestPatcher.Core/Patching/PatchingManager.cs b/QuestPatcher.Core/Patching/PatchingManager.cs
@@ -706,7 +706,10 @@ public async Task PatchApp()
             PatchingStage = PatchingStage.UninstallingOriginal;
             try
             {
-                await _debugBridge.UninstallApp(_config.AppId);
+                if(!await _debugBridge.UninstallApp(_config.AppId))
+                {
+                    Log.Warning("APK was already uninstalled");
+                }
             }
             catch (AdbException)
             {