Migrate to Kotlin Instant

Author: d4rken

app-common-io/src/main/java/eu/darken/butler/common/files/APathGateway.kt

@@ -3,7 +3,7 @@ package eu.darken.butler.common.files
 import eu.darken.butler.common.sharedresource.HasSharedResource
 import kotlinx.coroutines.flow.Flow
 import okio.FileHandle
-import java.time.Instant
+import kotlin.time.Instant
 
 interface APathGateway<
         P : APath,

app-common-io/src/main/java/eu/darken/butler/common/files/APathLookup.kt

@@ -3,7 +3,7 @@ package eu.darken.butler.common.files
 import androidx.annotation.Keep
 import eu.darken.butler.common.ca.CaString
 import eu.darken.butler.common.files.extensions.Segments
-import java.time.Instant
+import kotlin.time.Instant
 
 @Keep
 interface APathLookup<out T : APath> {

app-common-io/src/main/java/eu/darken/butler/common/files/GatewaySwitch.kt

@@ -16,9 +16,9 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.plus
 import okio.FileHandle
 import okio.IOException
-import java.time.Instant
 import javax.inject.Inject
 import javax.inject.Singleton
+import kotlin.time.Instant
 
 @Singleton
 class GatewaySwitch @Inject constructor(

app-common-io/src/main/java/eu/darken/butler/common/files/extensions/APathExtensions.kt

@@ -25,8 +25,8 @@ import kotlinx.coroutines.flow.Flow
 import okio.FileHandle
 import java.io.File
 import java.io.IOException
-import java.time.Instant
 import java.util.Collections
+import kotlin.time.Instant
 import eu.darken.butler.common.files.local.removePrefix as removePrefixLocalPath
 import eu.darken.butler.common.files.saf.removePrefix as removePrefixSafPath
 

app-common-io/src/main/java/eu/darken/butler/common/files/local/LocalGateway.kt

@@ -46,9 +46,9 @@ import kotlinx.coroutines.withContext
 import okio.FileHandle
 import java.io.File
 import java.io.IOException
-import java.time.Instant
 import javax.inject.Inject
 import javax.inject.Singleton
+import kotlin.time.Instant
 
 @Suppress("BlockingMethodInNonBlockingContext")
 @Singleton
@@ -879,7 +879,7 @@ class LocalGateway @Inject constructor(
             when {
                 mode == Mode.NORMAL || mode == Mode.AUTO && canNormalWrite -> {
                     log(TAG, VERBOSE) { "setModifiedAt($mode->NORMAL): $path" }
-                    path.file.setLastModified(modifiedAt.toEpochMilli())
+                    path.file.setLastModified(modifiedAt.toEpochMilliseconds())
                 }
 
                 hasRoot() && (mode == Mode.ROOT || mode == Mode.AUTO) -> {

app-common-io/src/main/java/eu/darken/butler/common/files/local/LocalPathExtensions.kt

@@ -15,7 +15,7 @@ import eu.darken.butler.common.files.extensions.asFile
 import eu.darken.butler.common.funnel.IPCFunnel
 import eu.darken.butler.common.pkgs.pkgops.LibcoreTool
 import java.io.File
-import java.time.Instant
+import kotlin.time.Instant
 
 
 fun LocalPath.crumbsTo(child: LocalPath): Array<String> {
@@ -45,7 +45,7 @@ fun LocalPath.performLookup(): LocalPathLookup {
         fileType = type,
         lookedUp = this,
         size = file.length(),
-        modifiedAt = Instant.ofEpochMilli(file.lastModified()),
+        modifiedAt = Instant.fromEpochMilliseconds(file.lastModified()),
         target = file.readLink()?.let { LocalPath.build(it) }
     )
 }

app-common-io/src/main/java/eu/darken/butler/common/files/local/LocalPathLookup.kt

@@ -5,7 +5,7 @@ import eu.darken.butler.common.files.APathLookup
 import eu.darken.butler.common.files.FileType
 import eu.darken.butler.common.files.LocalPath
 import kotlinx.parcelize.Parcelize
-import java.time.Instant
+import kotlin.time.Instant
 
 @Parcelize
 data class LocalPathLookup(

app-common-io/src/main/java/eu/darken/butler/common/files/local/ipc/FileOpsClient.kt

@@ -17,7 +17,7 @@ import eu.darken.butler.common.ipc.IpcClientModule
 import eu.darken.butler.common.ipc.fileHandle
 import kotlinx.coroutines.flow.Flow
 import okio.FileHandle
-import java.time.Instant
+import kotlin.time.Instant
 
 class FileOpsClient @AssistedInject constructor(
     @Assisted private val fileOpsConnection: FileOpsConnection
@@ -142,7 +142,7 @@ class FileOpsClient @AssistedInject constructor(
     }
 
     fun setModifiedAt(path: LocalPath, modifiedAt: Instant): Boolean = try {
-        fileOpsConnection.setModifiedAt(path, modifiedAt.toEpochMilli())
+        fileOpsConnection.setModifiedAt(path, modifiedAt.toEpochMilliseconds())
     } catch (e: Exception) {
         throw e.refineException()
     }

app-common-io/src/main/java/eu/darken/butler/common/files/saf/SAFDocFile.kt

@@ -23,7 +23,7 @@ import eu.darken.butler.common.files.io.useQuietly
 import java.io.File
 import java.io.FileNotFoundException
 import java.io.IOException
-import java.time.Instant
+import kotlin.time.Instant
 
 
 data class SAFDocFile(
@@ -86,7 +86,7 @@ data class SAFDocFile(
         }
 
     val lastModified: Instant
-        get() = Instant.ofEpochMilli(queryForLong(DocumentsContract.Document.COLUMN_LAST_MODIFIED) ?: 0)
+        get() = Instant.fromEpochMilliseconds(queryForLong(DocumentsContract.Document.COLUMN_LAST_MODIFIED) ?: 0)
 
     val length: Long
         get() = queryForLong(DocumentsContract.Document.COLUMN_SIZE) ?: 0
@@ -157,7 +157,7 @@ data class SAFDocFile(
 
     fun setLastModified(lastModified: Instant): Boolean = try {
         val updateValues = ContentValues()
-        updateValues.put(DocumentsContract.Document.COLUMN_LAST_MODIFIED, lastModified.toEpochMilli())
+        updateValues.put(DocumentsContract.Document.COLUMN_LAST_MODIFIED, lastModified.toEpochMilliseconds())
         val updated: Int = resolver.update(uri, updateValues, null, null)
         updated == 1
     } catch (e: Exception) {

app-common-io/src/main/java/eu/darken/butler/common/files/saf/SAFGateway.kt

@@ -30,10 +30,10 @@ import kotlinx.coroutines.plus
 import kotlinx.coroutines.withContext
 import okio.FileHandle
 import java.io.IOException
-import java.time.Instant
 import java.util.LinkedList
 import javax.inject.Inject
 import javax.inject.Singleton
+import kotlin.time.Instant
 
 @Singleton
 class SAFGateway @Inject constructor(