signalapp/Signal-iOS
signalapp/Signal-iOS
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 4 Wiki Activity

Merge branch 'charlesmchen/fixFileSizeFormatting' into release/5.3.0

Browse Source
This commit is contained in:
Matthew Chen 2021-01-21 21:08:08 -03:00
commit b02cc27aba
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
SignalServiceKit/src/Util/OWSFormat.m
View File

@ -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", gbSize];
} 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];
}
}