From 4af2a8d6fd93d1ffce839ffce4e8e6a0fef426e5 Mon Sep 17 00:00:00 2001 From: Rahul Patel Date: Mon, 12 Aug 2019 13:22:42 +0530 Subject: [PATCH] Notification : Do not show negative progress https://gitlab.com/AuroraOSS/AuroraStore/issues/141 --- .../java/com/aurora/store/fragment/details/ActionButton.java | 2 -- .../java/com/aurora/store/notification/GeneralNotification.java | 2 ++ app/src/main/java/com/aurora/store/task/LiveUpdate.java | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/aurora/store/fragment/details/ActionButton.java b/app/src/main/java/com/aurora/store/fragment/details/ActionButton.java index 90d48ec0f..29cdb6afc 100644 --- a/app/src/main/java/com/aurora/store/fragment/details/ActionButton.java +++ b/app/src/main/java/com/aurora/store/fragment/details/ActionButton.java @@ -354,8 +354,6 @@ public class ActionButton extends AbstractHelper { public void onResumed(int groupId, @NotNull Download download, @NotNull FetchGroup fetchGroup) { if (groupId == hashCode) { int progress = fetchGroup.getGroupDownloadProgress(); - if (progress < 0) - progress = 0; notification.notifyProgress(progress, 0, hashCode); ContextUtil.runOnUiThread(() -> { progressStatus.setText(R.string.download_progress); diff --git a/app/src/main/java/com/aurora/store/notification/GeneralNotification.java b/app/src/main/java/com/aurora/store/notification/GeneralNotification.java index 8c4fe7631..7b6ee2380 100644 --- a/app/src/main/java/com/aurora/store/notification/GeneralNotification.java +++ b/app/src/main/java/com/aurora/store/notification/GeneralNotification.java @@ -62,6 +62,8 @@ public class GeneralNotification extends NotificationBase { public void notifyProgress(int progress, long downloadedBytesPerSecond, int requestId) { if (NotificationUtil.shouldNotify(context, app.getPackageName())) { builder = getBuilder(); + if (progress < 0) + progress = 0; builder.setProgress(100, progress, false); builder.setSubText(new StringBuilder().append(Util.humanReadableByteSpeed(downloadedBytesPerSecond, true))); builder.setContentText(new StringBuilder().append(progress).append("%")); diff --git a/app/src/main/java/com/aurora/store/task/LiveUpdate.java b/app/src/main/java/com/aurora/store/task/LiveUpdate.java index 2c7973bb3..cd5ade96b 100644 --- a/app/src/main/java/com/aurora/store/task/LiveUpdate.java +++ b/app/src/main/java/com/aurora/store/task/LiveUpdate.java @@ -83,8 +83,6 @@ public class LiveUpdate extends BaseTask { public void onResumed(int groupId, @NotNull Download download, @NotNull FetchGroup fetchGroup) { if (groupId == hashCode) { int progress = fetchGroup.getGroupDownloadProgress(); - if (progress < 0) - progress = 0; notification.notifyProgress(progress, 0, hashCode); } }