Skip to content

Patch 1 #1254

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shirish-goyal wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Patch 1 #1254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8fb347e
Replace SimpleDateFormat with kotlinx.datetime formatting in ImageUtils
shirish-goyal Apr 5, 2026
649dd6c
Replace SimpleDateFormat with kotlinx.datetime formatting in ObjectSt…
shirish-goyal Apr 5, 2026
f0f4866
Merge branch 'master' into patch-1
shirish-goyal Apr 12, 2026
978d986
Merge branch 'master' into patch-1
shirish-goyal May 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 18 additions & 5 deletions app/src/main/java/org/greenstand/android/TreeTracker/api/ObjectStorageClient.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,12 @@ import org.greenstand.android.TreeTracker.BuildConfig
import timber.log.Timber
import java.io.ByteArrayInputStream
import java.io.File
import java.text.SimpleDateFormat
import java.util.*
import java.util.Date
import java.util.UUID
import kotlinx.datetime.Clock
import kotlinx.datetime.TimeZone
import kotlinx.datetime.toLocalDateTime

@Suppress("ImplicitDefaultLocale")
class ObjectStorageClient private constructor(
Expand Down Expand Up @@ -100,7 +102,6 @@ class ObjectStorageClient private constructor(
}
}

@SuppressLint("SimpleDateFormat")
@Throws(AmazonClientException::class)
fun put(
path: String,
Expand All @@ -111,7 +112,13 @@ class ObjectStorageClient private constructor(
acl.grantPermission(GroupGrantee.AllUsers, Permission.Read)

val image = File(path)
val timeStamp = SimpleDateFormat("yyyy.MM.dd.HH.mm.ss").format(Date())
val now = Clock.System.now()
.toLocalDateTime(TimeZone.currentSystemDefault())

val timeStamp = "%04d.%02d.%02d.%02d.%02d.%02d".format(
now.year, now.monthNumber, now.dayOfMonth,
now.hour, now.minute, now.second
)

val dosKey = timeStamp + '_' + lat + '_' + long + '_' + UUID.randomUUID() + '_' + image.name
val poRequest = PutObjectRequest(BuildConfig.OBJECT_STORAGE_BUCKET_IMAGES, dosKey, image)
Expand Down Expand Up @@ -145,7 +152,13 @@ class ObjectStorageClient private constructor(
val acl = AccessControlList()
acl.grantPermission(GroupGrantee.AllUsers, Permission.Read)

val timeStamp = SimpleDateFormat("yyyy-MM-dd-HH-mm-ss").format(Date())
val now = Clock.System.now()
.toLocalDateTime(TimeZone.currentSystemDefault())

val timeStamp = "%04d-%02d-%02d-%02d-%02d-%02d".format(
now.year, now.monthNumber, now.dayOfMonth,
now.hour, now.minute, now.second
)

val dosKey = timeStamp + '_'.toString() + UUID.randomUUID() + '_'.toString() + bundleId + ".json"

Expand Down Expand Up @@ -176,4 +189,4 @@ class ObjectStorageClient private constructor(

fun instance(): ObjectStorageClient = INSTANCE!!
}
}
}
15 changes: 11 additions & 4 deletions app/src/main/java/org/greenstand/android/TreeTracker/utilities/ImageUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,10 @@ import java.io.ByteArrayOutputStream
import java.io.File
import java.io.FileOutputStream
import java.io.IOException
import java.text.SimpleDateFormat
import java.util.*
import kotlinx.datetime.Clock
import kotlinx.datetime.TimeZone
import kotlinx.datetime.toLocalDateTime
import kotlin.math.abs
import kotlin.math.ceil
import kotlin.math.round
Expand All @@ -50,11 +52,16 @@ object ImageUtils {
return f
}

@SuppressLint("SimpleDateFormat")
@Throws(IOException::class)
fun createImageFile(context: Context): File {
val now = Clock.System.now()
.toLocalDateTime(TimeZone.currentSystemDefault())

val timeStamp = "%04d%02d%02d_%02d%02d%02d".format(
now.year, now.monthNumber, now.dayOfMonth,
now.hour, now.minute, now.second
)
// Create an image file name
val timeStamp = SimpleDateFormat("yyyyMMdd_HHmmss").format(Date())
val imageFileName = JPEG_FILE_PREFIX + timeStamp + "_"
val directory = context.getDir("treeImages", Context.MODE_PRIVATE)

Expand Down Expand Up @@ -603,4 +610,4 @@ object ImageUtils {

return encodedImage
}
}
}
Loading