Merge branch 'beta' into fix/lost-account-after-changing-name

94a11c2f · Leonardo Aramaki · GitHub · d0563b24 · f55a7a1d · 94a11c2f
Unverified Commit 94a11c2f authored Jun 01, 2018 by Leonardo Aramaki Committed by GitHub Jun 01, 2018
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

FileViewModel.kt ...java/chat/rocket/android/files/viewmodel/FileViewModel.kt +4 -3

No files found.
--- a/app/src/main/java/chat/rocket/android/files/viewmodel/FileViewModel.kt
+++ b/app/src/main/java/chat/rocket/android/files/viewmodel/FileViewModel.kt
@@ -41,9 +41,10 @@ class FileViewModel(
    }
    private fun getFileUploadDate(): String {
-        return DateTimeHelper.getDateTime(
+        genericAttachment.uploadedAt?.let {
-            DateTimeHelper.getLocalDateTime(genericAttachment.uploadedAt)
+            return DateTimeHelper.getDateTime(DateTimeHelper.getLocalDateTime(it))
-        )
+        }
+        return ""
    }
    private fun getFileUrl(): String? {