From 784733cd76870cc222204ce40087ed71d59448c6 Mon Sep 17 00:00:00 2001
From: Peter Serwylo <peter@serwylo.com>
Date: Wed, 27 Sep 2017 23:56:38 +1000
Subject: [PATCH] Show 'download cancelled' message when dismissing downloading
app
---
.../views/updates/items/AppStatusListItemController.java | 6 +++++-
app/src/main/res/values/strings.xml | 1 +
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/app/src/main/java/org/fdroid/fdroid/views/updates/items/AppStatusListItemController.java b/app/src/main/java/org/fdroid/fdroid/views/updates/items/AppStatusListItemController.java
index 37b27a5a6..981409eff 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/updates/items/AppStatusListItemController.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/updates/items/AppStatusListItemController.java
@@ -56,20 +56,24 @@ public class AppStatusListItemController extends AppListItemController {
@Override
protected DismissResult onDismissApp(@NonNull App app) {
AppUpdateStatus status = getCurrentStatus();
+ CharSequence message = null;
if (status != null) {
AppUpdateStatusManager manager = AppUpdateStatusManager.getInstance(activity);
manager.removeApk(status.getUniqueKey());
switch (status.status) {
case ReadyToInstall:
manager.markAsNoLongerPendingInstall(status);
+ // Do this silently, because it should be pretty obvious based on the context
+ // of a "Ready to install" app being dismissed.
break;
case Downloading:
cancelDownload();
+ message = activity.getString(R.string.app_list__dismiss_downloading_app);
break;
}
}
- return new DismissResult(true);
+ return new DismissResult(message, true);
}
}
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a3ea2f2f0..abf63d459 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -89,6 +89,7 @@ This often occurs with apps installed via Google Play or other sources, if they
<string name="app_list_download_ready">Downloaded, ready to install</string>
<string name="app_list__dismiss_app_update">Update ignored</string>
<string name="app_list__dismiss_vulnerable_app">Vulnerability ignored</string>
+ <string name="app_list__dismiss_downloading_app">Download canceled</string>
<string name="installed_apps__activity_title">Installed Apps</string>
<string name="installed_app__updates_ignored">Updates ignored</string>