Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

send ACTION_UNINSTALL_STARTED before any work has started

Browse Source 
This needs to be broadcast as soon as possible so the UI can change to lock
out the user from doing conflicting actions.

refs #1357
This commit is contained in:
Hans-Christoph Steiner 2018-06-27 16:48:56 +02:00
parent ab8f405dd2
commit 6c66697762
6 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/fdroid/fdroid/installer/DefaultInstaller.java
View File

@ -63,8 +63,6 @@ public class DefaultInstaller extends Installer {
@Override @Override
protected void uninstallPackage() { protected void uninstallPackage() {
sendBroadcastUninstall(Installer.ACTION_UNINSTALL_STARTED);
Intent uninstallIntent = new Intent(context, DefaultInstallerActivity.class); Intent uninstallIntent = new Intent(context, DefaultInstallerActivity.class);
uninstallIntent.setAction(DefaultInstallerActivity.ACTION_UNINSTALL_PACKAGE); uninstallIntent.setAction(DefaultInstallerActivity.ACTION_UNINSTALL_PACKAGE);
uninstallIntent.putExtra(Installer.EXTRA_APK, apk); uninstallIntent.putExtra(Installer.EXTRA_APK, apk);

2
app/src/main/java/org/fdroid/fdroid/installer/ExtensionInstaller.java
View File

@ -78,8 +78,6 @@ public class ExtensionInstaller extends Installer {
@Override @Override
protected void uninstallPackage() { protected void uninstallPackage() {
sendBroadcastUninstall(Installer.ACTION_UNINSTALL_STARTED);
Intent uninstallIntent = new Intent(context, InstallExtensionDialogActivity.class); Intent uninstallIntent = new Intent(context, InstallExtensionDialogActivity.class);
uninstallIntent.setAction(InstallExtensionDialogActivity.ACTION_UNINSTALL); uninstallIntent.setAction(InstallExtensionDialogActivity.ACTION_UNINSTALL);

2
app/src/main/java/org/fdroid/fdroid/installer/FileInstaller.java
View File

@ -68,8 +68,6 @@ public class FileInstaller extends Installer {
@Override @Override
protected void uninstallPackage() { protected void uninstallPackage() {
sendBroadcastUninstall(Installer.ACTION_UNINSTALL_STARTED);
Intent uninstallIntent = new Intent(context, FileInstallerActivity.class); Intent uninstallIntent = new Intent(context, FileInstallerActivity.class);
uninstallIntent.setAction(FileInstallerActivity.ACTION_UNINSTALL_FILE); uninstallIntent.setAction(FileInstallerActivity.ACTION_UNINSTALL_FILE);
uninstallIntent.putExtra(Installer.EXTRA_APK, apk); uninstallIntent.putExtra(Installer.EXTRA_APK, apk);

9
app/src/main/java/org/fdroid/fdroid/installer/Installer.java
View File

@ -200,6 +200,15 @@ public abstract class Installer {
} }
private void sendBroadcastUninstall(String action, PendingIntent pendingIntent, String errorMessage) { private void sendBroadcastUninstall(String action, PendingIntent pendingIntent, String errorMessage) {
sendBroadcastUninstall(context, apk, action, pendingIntent, errorMessage);
}
static void sendBroadcastUninstall(Context context, Apk apk, String action) {
sendBroadcastUninstall(context, apk, action, null, null);
}
private static void sendBroadcastUninstall(Context context, Apk apk, String action,
PendingIntent pendingIntent, String errorMessage) {
Uri uri = Uri.fromParts("package", apk.packageName, null); Uri uri = Uri.fromParts("package", apk.packageName, null);
Intent intent = new Intent(action); Intent intent = new Intent(action);

3
app/src/main/java/org/fdroid/fdroid/installer/InstallerService.java
View File

@ -142,6 +142,9 @@ public class InstallerService extends JobIntentService {
*/ */
public static void uninstall(Context context, @NonNull Apk apk) { public static void uninstall(Context context, @NonNull Apk apk) {
Objects.requireNonNull(apk); Objects.requireNonNull(apk);
Installer.sendBroadcastUninstall(context, apk, Installer.ACTION_UNINSTALL_STARTED);
Intent intent = new Intent(context, InstallerService.class); Intent intent = new Intent(context, InstallerService.class);
intent.setAction(ACTION_UNINSTALL); intent.setAction(ACTION_UNINSTALL);
intent.putExtra(Installer.EXTRA_APK, apk); intent.putExtra(Installer.EXTRA_APK, apk);

2
app/src/main/java/org/fdroid/fdroid/installer/PrivilegedInstaller.java
View File

@ -355,8 +355,6 @@ public class PrivilegedInstaller extends Installer {
@Override @Override
protected void uninstallPackage() { protected void uninstallPackage() {
sendBroadcastUninstall(Installer.ACTION_UNINSTALL_STARTED);
ServiceConnection mServiceConnection = new ServiceConnection() { ServiceConnection mServiceConnection = new ServiceConnection() {
public void onServiceConnected(ComponentName name, IBinder service) { public void onServiceConnected(ComponentName name, IBinder service) {
IPrivilegedService privService = IPrivilegedService.Stub.asInterface(service); IPrivilegedService privService = IPrivilegedService.Stub.asInterface(service);