From 860113e842d1aec6547c962dbf73855060ee6b05 Mon Sep 17 00:00:00 2001 From: tobiasKaminsky Date: Wed, 7 Dec 2022 16:01:17 +0100 Subject: [PATCH 1/2] mTime: use typed parameter (long) instead of String Signed-off-by: tobiasKaminsky --- .../android/datamodel/FileDataStorageManagerIT.java | 12 ++++++------ .../android/operations/UploadFileOperation.java | 4 ++-- .../android/providers/DocumentsStorageProvider.java | 2 +- build.gradle | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) 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); diff --git a/build.gradle b/build.gradle index d03fc6e5b1c1..919b4ea237d7 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { daggerVersion = "2.45" markwonVersion = "4.6.2" prismVersion = "2.0.0" - androidLibraryVersion = "master-SNAPSHOT" + androidLibraryVersion = "ufo-SNAPSHOT" mockitoVersion = "4.11.0" mockitoKotlinVersion = "4.1.0" mockkVersion = "1.13.3" From 606b515f16e67eb7c711dbd6f40d72fbec2607eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Brey?= Date: Wed, 22 Feb 2023 16:10:13 +0100 Subject: [PATCH 2/2] chore: Restore library version to master MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Álvaro Brey --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 919b4ea237d7..d03fc6e5b1c1 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { daggerVersion = "2.45" markwonVersion = "4.6.2" prismVersion = "2.0.0" - androidLibraryVersion = "ufo-SNAPSHOT" + androidLibraryVersion = "master-SNAPSHOT" mockitoVersion = "4.11.0" mockitoKotlinVersion = "4.1.0" mockkVersion = "1.13.3"