From d1cbbe72d748cada7773bf2618ad57342fee7853 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Fri, 20 Jul 2018 22:26:46 +0200
Subject: [PATCH] when canceling download, delay removeApk() until its no
 longer needed

This was deleting the Apk from appMapping too fast, so the later status
updates couldn't be sent.
---
 app/src/main/java/org/fdroid/fdroid/AppUpdateStatusManager.java  | 1 +
 .../java/org/fdroid/fdroid/installer/InstallManagerService.java  | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/org/fdroid/fdroid/AppUpdateStatusManager.java b/app/src/main/java/org/fdroid/fdroid/AppUpdateStatusManager.java
index 3ba0e8510..c7ebc23da 100644
--- a/app/src/main/java/org/fdroid/fdroid/AppUpdateStatusManager.java
+++ b/app/src/main/java/org/fdroid/fdroid/AppUpdateStatusManager.java
@@ -427,6 +427,7 @@ public final class AppUpdateStatusManager {
                 entry.errorText = errorText;
                 entry.intent = null;
                 notifyChange(entry, true);
+                removeApk(url);
             }
         }
     }
diff --git a/app/src/main/java/org/fdroid/fdroid/installer/InstallManagerService.java b/app/src/main/java/org/fdroid/fdroid/installer/InstallManagerService.java
index 12140cf9e..baf0ad2e3 100644
--- a/app/src/main/java/org/fdroid/fdroid/installer/InstallManagerService.java
+++ b/app/src/main/java/org/fdroid/fdroid/installer/InstallManagerService.java
@@ -176,7 +176,6 @@ public class InstallManagerService extends Service {
                 DownloaderService.cancel(this, apk.getPatchObbUrl());
                 DownloaderService.cancel(this, apk.getMainObbUrl());
             }
-            appUpdateStatusManager.removeApk(urlString);
             return START_NOT_STICKY;
         } else if (ACTION_INSTALL.equals(action)) {
             if (!isPendingInstall(urlString)) {