oxen-io
/
session-ios
mirror of https://github.com/oxen-io/session-ios.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Respond to CR. 

// FREEBIE
This commit is contained in:
Matthew Chen 2017-04-26 13:27:24 -04:00
parent d42588b957
commit 788ec4ce01
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Podfile.lock
View File

@ -138,7 +138,7 @@ CHECKOUT OPTIONS:
:commit: 7054e4b13ee5bcd6d524adb6dc9a726e8c466308
:git: https://github.com/WhisperSystems/JSQMessagesViewController.git
SignalServiceKit:
:commit: c77ad7f77d636911f42595975bb47cdff8526f4d
:commit: cc055f034ae45dc5122e6e143b01bed4e4a46f80
:git: https://github.com/WhisperSystems/SignalServiceKit.git
SocketRocket:
:commit: 877ac7438be3ad0b45ef5ca3969574e4b97112bf

6
Signal/src/ViewControllers/ViewControllerUtils.m
View File

@ -88,9 +88,11 @@ NS_ASSUME_NONNULL_BEGIN
NSNumberFormatter *numberFormatter = [NSNumberFormatter new];
numberFormatter.numberStyle = NSNumberFormatterDecimalStyle;
return (fileSize > kOneMegabyte
? [[numberFormatter stringFromNumber:@(fileSize / kOneMegabyte)] stringByAppendingString:@" mb"]
? [[numberFormatter stringFromNumber:@(round(fileSize / (CGFloat)kOneMegabyte))]
stringByAppendingString:@" mb"]
: (fileSize > kOneKilobyte
? [[numberFormatter stringFromNumber:@(fileSize / kOneKilobyte)] stringByAppendingString:@" kb"]
? [[numberFormatter stringFromNumber:@(round(fileSize / (CGFloat)kOneKilobyte))]
stringByAppendingString:@" kb"]
: [[numberFormatter stringFromNumber:@(fileSize)] stringByAppendingString:@" bytes"]));
}