mirror/fdroidclient
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidclient.git synced 2026-02-04 20:21:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2881-no-dialog-on-active-abort' into 'master'

Browse Source 
Don't show error dialog for (un)installs when user actively aborted

Closes #2881

See merge request fdroid/fdroidclient!1469
This commit is contained in:
Torsten Grote
2024-11-04 16:17:32 +00:00
parent 7e3cf15542 f108aabd65
commit cade843225
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/org/fdroid/fdroid/installer/SessionInstallManager.java
View File

@@ -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);
}
}