From f108aabd652ecc7c3d5662752e988587ae215f23 Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Thu, 31 Oct 2024 14:17:32 -0300 Subject: [PATCH] [app] Don't show error dialog for (un)installs when user actively aborted --- .../fdroid/fdroid/installer/SessionInstallManager.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/fdroid/fdroid/installer/SessionInstallManager.java b/app/src/main/java/org/fdroid/fdroid/installer/SessionInstallManager.java index 04fb1b3bd..4556df817 100644 --- a/app/src/main/java/org/fdroid/fdroid/installer/SessionInstallManager.java +++ b/app/src/main/java/org/fdroid/fdroid/installer/SessionInstallManager.java @@ -224,8 +224,10 @@ public class SessionInstallManager extends BroadcastReceiver { String action = Installer.ACTION_INSTALL_USER_INTERACTION; Installer.sendBroadcastInstall(context, canonicalUri, action, app, apk, pendingIntent, null); } else { + // show no message when user actively aborted + String m = status == PackageInstaller.STATUS_FAILURE_ABORTED ? null : msg; String action = Installer.ACTION_INSTALL_INTERRUPTED; - Installer.sendBroadcastInstall(context, canonicalUri, action, app, apk, null, msg); + Installer.sendBroadcastInstall(context, canonicalUri, action, app, apk, null, m); } } @@ -249,8 +251,10 @@ public class SessionInstallManager extends BroadcastReceiver { String action = Installer.ACTION_UNINSTALL_USER_INTERACTION; sendBroadcastUninstall(packageName, action, pendingIntent, null); } else { + // show no message when user actively aborted + String m = status == PackageInstaller.STATUS_FAILURE_ABORTED ? null : msg; String action = Installer.ACTION_UNINSTALL_INTERRUPTED; - sendBroadcastUninstall(packageName, action, null, msg); + sendBroadcastUninstall(packageName, action, null, m); } }