From af1f3941a4f072399a7ac737cdb8c306d8db8bd7 Mon Sep 17 00:00:00 2001
From: Doug <douglase@element.io>
Date: Fri, 27 Aug 2021 16:41:10 +0100
Subject: [PATCH 1/2] Add a fileSizeToString method using NSByteCountFormatter.

---
 MatrixSDK/Utils/MXTools.h |  7 +++++++
 MatrixSDK/Utils/MXTools.m | 11 +++++++++++
 2 files changed, 18 insertions(+)

diff --git a/MatrixSDK/Utils/MXTools.h b/MatrixSDK/Utils/MXTools.h
index 38414e7359..2da832b5b8 100644
--- 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
index 4bbb17b168..45b8d9df05 100644
--- 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)

From 03f8f5f1bfbe7af3036e6e6095d18658b571943f Mon Sep 17 00:00:00 2001
From: Doug <douglase@element.io>
Date: Mon, 6 Sep 2021 17:14:27 +0100
Subject: [PATCH 2/2] Add changelog entry.

---
 changelog.d/4479.change | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/4479.change

diff --git a/changelog.d/4479.change b/changelog.d/4479.change
new file mode 100644
index 0000000000..9ec2fccd15
--- /dev/null
+++ b/changelog.d/4479.change
@@ -0,0 +1 @@
+MXTools: Add fileSizeToString function that uses NSByteCountFormatter.