From 7d1fac2729fa6a142e96de95096b80dc45c3477b Mon Sep 17 00:00:00 2001 From: Peter Serwylo Date: Fri, 26 May 2017 15:57:50 +1000 Subject: [PATCH] Extract isDownloading check into method of status class. This is also going to be used elsewhere. --- app/src/main/java/org/fdroid/fdroid/AppDetails2.java | 3 +-- .../main/java/org/fdroid/fdroid/AppUpdateStatusManager.java | 4 ++++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/fdroid/fdroid/AppDetails2.java b/app/src/main/java/org/fdroid/fdroid/AppDetails2.java index e2fa2978c..29e88242f 100644 --- a/app/src/main/java/org/fdroid/fdroid/AppDetails2.java +++ b/app/src/main/java/org/fdroid/fdroid/AppDetails2.java @@ -691,8 +691,7 @@ public class AppDetails2 extends AppCompatActivity implements ShareChooserDialog @Override public boolean isAppDownloading() { - return currentStatus != null && - (currentStatus.status == AppUpdateStatusManager.Status.PendingDownload || currentStatus.status == AppUpdateStatusManager.Status.Downloading); + return currentStatus != null && currentStatus.isDownloading(); } @Override diff --git a/app/src/main/java/org/fdroid/fdroid/AppUpdateStatusManager.java b/app/src/main/java/org/fdroid/fdroid/AppUpdateStatusManager.java index 31acaa2bf..453516771 100644 --- a/app/src/main/java/org/fdroid/fdroid/AppUpdateStatusManager.java +++ b/app/src/main/java/org/fdroid/fdroid/AppUpdateStatusManager.java @@ -184,6 +184,10 @@ public final class AppUpdateStatusManager { copy.progressMax = progressMax; return copy; } + + public boolean isDownloading() { + return status == Status.Downloading || status == Status.PendingDownload; + } } private final Context context;