From fe21c2cd49b4c7d40e61c69dc1c695cbf5220a60 Mon Sep 17 00:00:00 2001
From: Gabriele M <moto.falcon.git@gmail.com>
Date: Mon, 17 Jul 2017 23:49:11 +0200
Subject: [PATCH] Treat download resume and verification in the same way

Allowing to verify downloads, but not install them makes no sense
currently, so don't treat the two cases differently.
---
 res/values/strings.xml                            |  1 -
 src/org/lineageos/updater/UpdatesListAdapter.java | 13 +++----------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0bbd280e..4c5bcc21 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -79,7 +79,6 @@
     <string name="action_description_pause">Pause download</string>
     <string name="action_description_resume">Resume download</string>
     <string name="action_description_install">Install update</string>
-    <string name="action_description_verify">Verify 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 67fa9bb3..2e7509a8 100644
--- a/src/org/lineageos/updater/UpdatesListAdapter.java
+++ b/src/org/lineageos/updater/UpdatesListAdapter.java
@@ -54,7 +54,6 @@ public class UpdatesListAdapter extends RecyclerView.Adapter<UpdatesListAdapter.
         DOWNLOAD,
         PAUSE,
         RESUME,
-        VERIFY,
         INSTALL
     }
 
@@ -150,12 +149,8 @@ public class UpdatesListAdapter extends RecyclerView.Adapter<UpdatesListAdapter.
             viewHolder.mProgressBar.setIndeterminate(true);
             viewHolder.mProgressPercentage.setText(NumberFormat.getPercentInstance().format(1));
         } else {
-            if (update.getFile().length() == update.getFileSize()) {
-                setButtonAction(viewHolder.mAction, Action.VERIFY, downloadId, !busy);
-            } else {
-                setButtonAction(viewHolder.mAction, Action.RESUME, downloadId, enabled);
-            }
             canDelete = true;
+            setButtonAction(viewHolder.mAction, Action.RESUME, downloadId, enabled);
             String downloaded = Formatter.formatBytes(mContext.getResources(),
                     update.getFile().length(), Formatter.FLAG_SHORTER).value;
             String total = Formatter.formatShortFileSize(mContext, update.getFileSize());
@@ -281,11 +276,9 @@ public class UpdatesListAdapter extends RecyclerView.Adapter<UpdatesListAdapter.
                 });
                 break;
             case RESUME:
-            case VERIFY:
                 button.setImageResource(R.drawable.ic_resume);
-                button.setContentDescription(action == Action.RESUME ?
-                        mContext.getString(R.string.action_description_resume) :
-                        mContext.getString(R.string.action_description_verify));
+                button.setContentDescription(
+                        mContext.getString(R.string.action_description_resume));
                 button.setEnabled(enabled);
                 button.setOnClickListener(!enabled ? null : new View.OnClickListener() {
                     @Override