From ebe0bb2e4268e7e1ae62ba927bce2a9b0434a793 Mon Sep 17 00:00:00 2001
From: Gabriele M <moto.falcon.git@gmail.com>
Date: Wed, 19 Jul 2017 21:11:46 +0200
Subject: [PATCH] Use a method to determine if the list is "busy"

Consider also installing updates, needed for A/B updates.
---
 .../lineageos/updater/UpdatesListAdapter.java   | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/org/lineageos/updater/UpdatesListAdapter.java b/src/org/lineageos/updater/UpdatesListAdapter.java
index 017d075..a7f3391 100644
--- a/src/org/lineageos/updater/UpdatesListAdapter.java
+++ b/src/org/lineageos/updater/UpdatesListAdapter.java
@@ -114,9 +114,6 @@ public class UpdatesListAdapter extends RecyclerView.Adapter<UpdatesListAdapter.
                 BuildInfoUtils.getBuildVersion(), buildDate);
         viewHolder.mBuildInfo.setText(buildInfoText);
 
-        boolean busy = mUpdaterController.hasActiveDownloads() ||
-                mUpdaterController.isVerifyingUpdate();
-
         boolean canDelete = false;
 
         final String downloadId = update.getDownloadId();
@@ -150,7 +147,7 @@ public class UpdatesListAdapter extends RecyclerView.Adapter<UpdatesListAdapter.
             viewHolder.mProgressPercentage.setText(NumberFormat.getPercentInstance().format(1));
         } else {
             canDelete = true;
-            setButtonAction(viewHolder.mAction, Action.RESUME, downloadId, !busy);
+            setButtonAction(viewHolder.mAction, Action.RESUME, downloadId, !isBusy());
             String downloaded = StringGenerator.bytesToMegabytes(mActivity,
                     update.getFile().length());
             String total = Formatter.formatShortFileSize(mActivity, update.getFileSize());
@@ -172,16 +169,13 @@ public class UpdatesListAdapter extends RecyclerView.Adapter<UpdatesListAdapter.
         viewHolder.mBuildDate.setText(buildDate);
         viewHolder.mBuildVersion.setText(buildVersion);
 
-        boolean busy = mUpdaterController.hasActiveDownloads() ||
-                mUpdaterController.isVerifyingUpdate();
-
         if (update.getPersistentStatus() == UpdateStatus.Persistent.VERIFIED) {
             viewHolder.itemView.setOnLongClickListener(
                     getDeleteClickListener(update.getDownloadId()));
-            setButtonAction(viewHolder.mAction, Action.INSTALL, update.getDownloadId(), !busy);
+            setButtonAction(viewHolder.mAction, Action.INSTALL, update.getDownloadId(), !isBusy());
         } else {
             viewHolder.itemView.setOnLongClickListener(null);
-            setButtonAction(viewHolder.mAction, Action.DOWNLOAD, update.getDownloadId(), !busy);
+            setButtonAction(viewHolder.mAction, Action.DOWNLOAD, update.getDownloadId(), !isBusy());
         }
     }
 
@@ -318,6 +312,11 @@ public class UpdatesListAdapter extends RecyclerView.Adapter<UpdatesListAdapter.
         button.setAlpha(enabled ? 1.f : mAlphaDisabledValue);
     }
 
+    private boolean isBusy() {
+        return mUpdaterController.hasActiveDownloads() || mUpdaterController.isVerifyingUpdate()
+                || mUpdaterController.isInstallingUpdate();
+    }
+
     private AlertDialog.Builder getDeleteDialog(final String downloadId) {
         return new AlertDialog.Builder(mActivity)
                 .setTitle(R.string.confirm_delete_dialog_title)