Merge pull request #1218 from matrix-org/doug/4479_media_size_selection

Add a fileSizeToString method using NSByteCountFormatter.
matrix-org · Sep 7, 2021 · 9a946d3 · 9a946d3
2 parents e1c91e0 + 03f8f5f
commit 9a946d3
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 0 deletions.
diff --git a/MatrixSDK/Utils/MXTools.h b/MatrixSDK/Utils/MXTools.h
@@ -193,6 +193,13 @@ FOUNDATION_EXPORT NSString *const kMXToolsRegexStringForMatrixGroupIdentifier;
  */
 + (long long)roundFileSize:(long long)filesize;
 
+/**
+ Return file size in string format using `NSByteCountFormatter`.
+ 
+ @param fileSize the file size in bytes.
+ */
++ (NSString*)fileSizeToString:(long)fileSize;
+
 /**
  Return file size in string format.
  

diff --git a/MatrixSDK/Utils/MXTools.m b/MatrixSDK/Utils/MXTools.m
@@ -636,6 +636,17 @@ + (long long)roundFileSize:(long long)filesize
     return roundedFileSize;
 }
 
++ (NSString*)fileSizeToString:(long)fileSize
+{
+    if (fileSize < 0)
+    {
+        return @"";
+    }
+
+    NSByteCountFormatter *formatter = [NSByteCountFormatter new];
+    return [formatter stringFromByteCount:fileSize];
+}
+
 + (NSString*)fileSizeToString:(long)fileSize round:(BOOL)round
 {
     if (fileSize < 0)

diff --git a/changelog.d/4479.change b/changelog.d/4479.change
@@ -0,0 +1 @@
+MXTools: Add fileSizeToString function that uses NSByteCountFormatter.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		MXTools: Add fileSizeToString function that uses NSByteCountFormatter.