From 8c9976d6225e6b4378531a05a8623bf3e66cff52 Mon Sep 17 00:00:00 2001
From: Gabriele M <moto.falcon.git@gmail.com>
Date: Sun, 12 Nov 2017 11:05:53 +0100
Subject: [PATCH] Show delete button for old updates

Old updates can't be installed if the current build is newer, so show
a delete button instead.

Change-Id: Ib34aad31d93e87a1009c23f86686fc4a008129e7
---
 res/drawable/ic_delete_black.xml               |  9 +++++++++
 res/values/strings.xml                         |  1 +
 .../lineageos/updater/UpdatesListAdapter.java  | 18 +++++++++++++++++-
 3 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 res/drawable/ic_delete_black.xml

diff --git a/res/drawable/ic_delete_black.xml b/res/drawable/ic_delete_black.xml
new file mode 100644
index 00000000..125a58f2
--- /dev/null
+++ b/res/drawable/ic_delete_black.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#000000"
+        android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z"/>
+</vector>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 16cbc5a3..2d33ebef 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -88,6 +88,7 @@
     <string name="action_description_resume">Resume download</string>
     <string name="action_description_install">Install update</string>
     <string name="action_description_info">Show information</string>
+    <string name="action_description_delete">Delete update</string>
 
     <string name="confirm_delete_dialog_title">Delete file</string>
     <string name="confirm_delete_dialog_message">Delete the selected update file?</string>
diff --git a/src/org/lineageos/updater/UpdatesListAdapter.java b/src/org/lineageos/updater/UpdatesListAdapter.java
index 5cb70dfd..ef877438 100644
--- a/src/org/lineageos/updater/UpdatesListAdapter.java
+++ b/src/org/lineageos/updater/UpdatesListAdapter.java
@@ -73,6 +73,7 @@ public class UpdatesListAdapter extends RecyclerView.Adapter<UpdatesListAdapter.
         RESUME,
         INSTALL,
         INFO,
+        DELETE,
     }
 
     public static class ViewHolder extends RecyclerView.ViewHolder {
@@ -189,7 +190,9 @@ public class UpdatesListAdapter extends RecyclerView.Adapter<UpdatesListAdapter.
 
         if (update.getPersistentStatus() == UpdateStatus.Persistent.VERIFIED) {
             viewHolder.itemView.setOnLongClickListener(getLongClickListener(update, true));
-            setButtonAction(viewHolder.mAction, Action.INSTALL, update.getDownloadId(), !isBusy());
+            setButtonAction(viewHolder.mAction,
+                    Utils.canInstall(update) ? Action.INSTALL : Action.DELETE,
+                    update.getDownloadId(), !isBusy());
         } else if (!Utils.canInstall(update)) {
             viewHolder.itemView.setOnLongClickListener(getLongClickListener(update, false));
             setButtonAction(viewHolder.mAction, Action.INFO, update.getDownloadId(), !isBusy());
@@ -377,6 +380,19 @@ public class UpdatesListAdapter extends RecyclerView.Adapter<UpdatesListAdapter.
                 };
             }
             break;
+            case DELETE: {
+                button.setImageResource(R.drawable.ic_delete_black);
+                button.setContentDescription(
+                        mActivity.getString(R.string.action_description_delete));
+                button.setEnabled(enabled);
+                clickListener = !enabled ? null : new View.OnClickListener() {
+                    @Override
+                    public void onClick(View view) {
+                        getDeleteDialog(downloadId).show();
+                    }
+                };
+            }
+            break;
             default:
                 clickListener = null;
         }