Refactor: Minor changes

zhanghai · Jan 28, 2024 · 7c80d3f · 7c80d3f
1 parent 07c47ba
commit 7c80d3f
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 6 deletions.
diff --git a/app/src/main/java/me/zhanghai/android/files/provider/common/FileTimeExtensions.kt b/app/src/main/java/me/zhanghai/android/files/provider/common/FileTimeExtensions.kt
@@ -0,0 +1,13 @@
+/*
+ * Copyright (c) 2024 Hai Zhang <dreaming.in.code.zh@gmail.com>
+ * All Rights Reserved.
+ */
+
+package me.zhanghai.android.files.provider.common
+
+import java8.nio.file.attribute.FileTime
+import org.threeten.bp.Instant
+import kotlin.reflect.KClass
+
+val KClass<FileTime>.EPOCH: FileTime
+    get() = FileTime.from(Instant.EPOCH)
diff --git a/app/src/main/java/me/zhanghai/android/files/provider/content/ContentFileAttributes.kt b/app/src/main/java/me/zhanghai/android/files/provider/content/ContentFileAttributes.kt
@@ -11,8 +11,8 @@ import java8.nio.file.attribute.FileTime
 import kotlinx.parcelize.Parcelize
 import kotlinx.parcelize.WriteWith
 import me.zhanghai.android.files.provider.common.AbstractContentProviderFileAttributes
+import me.zhanghai.android.files.provider.common.EPOCH
 import me.zhanghai.android.files.provider.common.FileTimeParceler
-import org.threeten.bp.Instant
 
 @Parcelize
 internal class ContentFileAttributes(
@@ -23,7 +23,7 @@ internal class ContentFileAttributes(
 ) : AbstractContentProviderFileAttributes() {
     companion object {
         fun from(mimeType: String?, size: Long, uri: Uri): ContentFileAttributes {
-            val lastModifiedTime = FileTime.from(Instant.EPOCH)
+            val lastModifiedTime = FileTime::class.EPOCH
             val fileKey = uri
             return ContentFileAttributes(lastModifiedTime, mimeType, size, fileKey)
         }

diff --git a/app/src/main/java/me/zhanghai/android/files/provider/ftp/FtpCopyMove.kt b/app/src/main/java/me/zhanghai/android/files/provider/ftp/FtpCopyMove.kt
@@ -105,7 +105,7 @@ internal object FtpCopyMove {
             val timestamp = sourceFile.timestamp
             if (timestamp != null) {
                 try {
-                    Client.setLastModifiedTime(target, sourceFile.timestamp.toInstantCompat())
+                    Client.setLastModifiedTime(target, timestamp.toInstantCompat())
                 } catch (e: IOException) {
                     e.printStackTrace()
                 }

diff --git a/app/src/main/java/me/zhanghai/android/files/provider/sftp/SftpFileAttributes.kt b/app/src/main/java/me/zhanghai/android/files/provider/sftp/SftpFileAttributes.kt
@@ -11,6 +11,7 @@ import kotlinx.parcelize.Parcelize
 import kotlinx.parcelize.WriteWith
 import me.zhanghai.android.files.provider.common.AbstractPosixFileAttributes
 import me.zhanghai.android.files.provider.common.ByteString
+import me.zhanghai.android.files.provider.common.EPOCH
 import me.zhanghai.android.files.provider.common.FileTimeParceler
 import me.zhanghai.android.files.provider.common.PosixFileMode
 import me.zhanghai.android.files.provider.common.PosixFileModeBit
@@ -41,7 +42,7 @@ internal data class SftpFileAttributes(
                 lastModifiedTime = FileTime.from(Instant.ofEpochSecond(attributes.mtime))
                 lastAccessTime = FileTime.from(Instant.ofEpochSecond(attributes.atime))
             } else {
-                lastModifiedTime = FileTime.from(Instant.EPOCH)
+                lastModifiedTime = FileTime::class.EPOCH
                 lastAccessTime = lastModifiedTime
             }
             val creationTime = lastModifiedTime

diff --git a/app/src/main/java/me/zhanghai/android/files/provider/smb/SmbShareFileAttributes.kt b/app/src/main/java/me/zhanghai/android/files/provider/smb/SmbShareFileAttributes.kt
@@ -11,10 +11,10 @@ import kotlinx.parcelize.Parcelize
 import kotlinx.parcelize.WriteWith
 import me.zhanghai.android.files.provider.common.AbstractBasicFileAttributes
 import me.zhanghai.android.files.provider.common.BasicFileType
+import me.zhanghai.android.files.provider.common.EPOCH
 import me.zhanghai.android.files.provider.common.FileTimeParceler
 import me.zhanghai.android.files.provider.smb.client.ShareInformation
 import me.zhanghai.android.files.provider.smb.client.ShareType
-import org.threeten.bp.Instant
 
 @Parcelize
 internal class SmbShareFileAttributes(
@@ -36,7 +36,7 @@ internal class SmbShareFileAttributes(
 
     companion object {
         fun from(shareInformation: ShareInformation, path: SmbPath): SmbShareFileAttributes {
-            val lastModifiedTime = FileTime.from(Instant.EPOCH)
+            val lastModifiedTime = FileTime::class.EPOCH
             val lastAccessTime = lastModifiedTime
             val creationTime = lastModifiedTime
             val type = when (shareInformation.type) {