diff --git a/app/src/androidTest/java/com/owncloud/android/datamodel/FileDataStorageManagerIT.java b/app/src/androidTest/java/com/owncloud/android/datamodel/FileDataStorageManagerIT.java
index 69c0e18e986e..67ad5238e148 100644
--- a/app/src/androidTest/java/com/owncloud/android/datamodel/FileDataStorageManagerIT.java
+++ b/app/src/androidTest/java/com/owncloud/android/datamodel/FileDataStorageManagerIT.java
@@ -104,20 +104,20 @@ public void testFolderContent() throws IOException {
         assertTrue(new UploadFileRemoteOperation(getDummyFile("chunkedFile.txt").getAbsolutePath(),
                                                  "/1/1/chunkedFile.txt",
                                                  "text/plain",
-                                                 String.valueOf(System.currentTimeMillis() / 1000))
+                                                 System.currentTimeMillis() / 1000)
                        .execute(client).isSuccess());
 
         assertTrue(new UploadFileRemoteOperation(getDummyFile("chunkedFile.txt").getAbsolutePath(),
                                                  "/1/1/chunkedFile2.txt",
                                                  "text/plain",
-                                                 String.valueOf(System.currentTimeMillis() / 1000))
+                                                 System.currentTimeMillis() / 1000)
                        .execute(client).isSuccess());
 
         File imageFile = getFile("imageFile.png");
         assertTrue(new UploadFileRemoteOperation(imageFile.getAbsolutePath(),
                                                  "/1/1/imageFile.png",
                                                  "image/png",
-                                                 String.valueOf(System.currentTimeMillis() / 1000))
+                                                 System.currentTimeMillis() / 1000)
                        .execute(client).isSuccess());
 
         // sync
@@ -166,7 +166,7 @@ public void testPhotoSearch() throws IOException {
         assertTrue(new UploadFileRemoteOperation(imageFile.getAbsolutePath(),
                                                  remotePath,
                                                  "image/png",
-                                                 String.valueOf(System.currentTimeMillis() / 1000))
+                                                 System.currentTimeMillis() / 1000)
                        .execute(client).isSuccess());
 
         assertNull(sut.getFileByDecryptedRemotePath(remotePath));
@@ -240,7 +240,7 @@ public void testGallerySearch() throws IOException {
         assertTrue(new UploadFileRemoteOperation(imageFile.getAbsolutePath(),
                                                  imagePath,
                                                  "image/png",
-                                                 String.valueOf((System.currentTimeMillis() - 10000) / 1000))
+                                                 (System.currentTimeMillis() - 10000) / 1000)
                        .execute(client).isSuccess());
 
         // Check that file does not yet exist in local database
@@ -251,7 +251,7 @@ public void testGallerySearch() throws IOException {
         assertTrue(new UploadFileRemoteOperation(videoFile.getAbsolutePath(),
                                                  videoPath,
                                                  "video/mpeg",
-                                                 String.valueOf((System.currentTimeMillis() + 10000) / 1000))
+                                                 (System.currentTimeMillis() + 10000) / 1000)
                        .execute(client).isSuccess());
 
         // Check that file does not yet exist in local database
diff --git a/app/src/main/java/com/owncloud/android/operations/UploadFileOperation.java b/app/src/main/java/com/owncloud/android/operations/UploadFileOperation.java
index d3bce07f0f51..98a8e310f1da 100644
--- a/app/src/main/java/com/owncloud/android/operations/UploadFileOperation.java
+++ b/app/src/main/java/com/owncloud/android/operations/UploadFileOperation.java
@@ -495,7 +495,7 @@ private RemoteOperationResult encryptedUpload(OwnCloudClient client, OCFile pare
             }
 
             // Get the last modification date of the file from the file system
-            String lastModifiedTimestamp = Long.toString(originalFile.lastModified() / 1000);
+            long lastModifiedTimestamp = originalFile.lastModified() / 1000;
 
             Long creationTimestamp = FileUtil.getCreationTimestamp(originalFile);
 
@@ -759,7 +759,7 @@ private RemoteOperationResult normalUpload(OwnCloudClient client) {
             }
 
             // Get the last modification date of the file from the file system
-            String lastModifiedTimestamp = Long.toString(originalFile.lastModified() / 1000);
+            long lastModifiedTimestamp = originalFile.lastModified() / 1000;
 
             final Long creationTimestamp = FileUtil.getCreationTimestamp(originalFile);
 
diff --git a/app/src/main/java/com/owncloud/android/providers/DocumentsStorageProvider.java b/app/src/main/java/com/owncloud/android/providers/DocumentsStorageProvider.java
index 67b2535c6d66..4d280abb8eb4 100644
--- a/app/src/main/java/com/owncloud/android/providers/DocumentsStorageProvider.java
+++ b/app/src/main/java/com/owncloud/android/providers/DocumentsStorageProvider.java
@@ -564,7 +564,7 @@ private String createFile(Document targetFolder, String displayName, String mime
                                                                      newFilePath,
                                                                      mimeType,
                                                                      "",
-                                                                     String.valueOf(System.currentTimeMillis() / 1000),
+                                                                     System.currentTimeMillis() / 1000,
                                                                      FileUtil.getCreationTimestamp(emptyFile),
                                                                      false)
             .execute(client);