From 8aaea5ea2d8a4da6e531c0cf8a25cf19b9b0329b Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 21 Jan 2021 10:05:41 -0300 Subject: [PATCH 1/2] Refine file size formatting. --- SignalServiceKit/src/Util/OWSFormat.m | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/SignalServiceKit/src/Util/OWSFormat.m b/SignalServiceKit/src/Util/OWSFormat.m index 56da611218..a27d35e8a7 100644 --- a/SignalServiceKit/src/Util/OWSFormat.m +++ b/SignalServiceKit/src/Util/OWSFormat.m @@ -34,13 +34,13 @@ NS_ASSUME_NONNULL_BEGIN // NOTE: These values are not localized. if (fileSize > kOneGigabyte * 1) { - int gbSize = MIN(1, (int)round(fileSize / (CGFloat)kOneGigabyte)); - return [NSString stringWithFormat:@"%lu GB", (unsigned long)gbSize]; + CGFloat gbSize = MAX((CGFloat)1.0, (CGFloat)fileSize / (CGFloat)kOneGigabyte); + return [NSString stringWithFormat:@"%0.1f GB", mbSize]; } else if (fileSize > kOneMegabyte * 1) { - int mbSize = MIN(1, (int)round(fileSize / (CGFloat)kOneMegabyte)); - return [NSString stringWithFormat:@"%lu MB", (unsigned long)mbSize]; + CGFloat mbSize = MAX((CGFloat)1.0, (CGFloat)fileSize / (CGFloat)kOneMegabyte); + return [NSString stringWithFormat:@"%0.1f MB", mbSize]; } else { - int kbSize = MIN(1, (int)round(fileSize / (CGFloat)kOneKilobyte)); + int kbSize = MAX(1, (int)round(fileSize / (CGFloat)kOneKilobyte)); return [NSString stringWithFormat:@"%lu KB", (unsigned long)kbSize]; } } From ecf85462ae85b73dc4100025058aaad528f51b0d Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 21 Jan 2021 21:07:59 -0300 Subject: [PATCH 2/2] Respond to CR. --- SignalServiceKit/src/Util/OWSFormat.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SignalServiceKit/src/Util/OWSFormat.m b/SignalServiceKit/src/Util/OWSFormat.m index a27d35e8a7..ee9267e11a 100644 --- a/SignalServiceKit/src/Util/OWSFormat.m +++ b/SignalServiceKit/src/Util/OWSFormat.m @@ -35,7 +35,7 @@ NS_ASSUME_NONNULL_BEGIN // NOTE: These values are not localized. if (fileSize > kOneGigabyte * 1) { CGFloat gbSize = MAX((CGFloat)1.0, (CGFloat)fileSize / (CGFloat)kOneGigabyte); - return [NSString stringWithFormat:@"%0.1f GB", mbSize]; + return [NSString stringWithFormat:@"%0.1f GB", gbSize]; } else if (fileSize > kOneMegabyte * 1) { CGFloat mbSize = MAX((CGFloat)1.0, (CGFloat)fileSize / (CGFloat)kOneMegabyte); return [NSString stringWithFormat:@"%0.1f MB", mbSize];