Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-27 14:40:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix DateTime conversions for search datePicker.

Browse Source
This commit is contained in:
Sagar
2025-03-28 19:33:01 +05:30
committed by GitHub
parent 36c50d7dde
commit b5987feab3
2 changed files with 36 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
View File

@@ -345,7 +345,9 @@ import org.thoughtcrime.securesms.util.visible
import org.thoughtcrime.securesms.verify.VerifyIdentityActivity
import org.thoughtcrime.securesms.wallpaper.ChatWallpaper
import org.thoughtcrime.securesms.wallpaper.ChatWallpaperDimLevelUtil
import java.time.Instant
import java.time.LocalDateTime
import java.time.ZoneId
import java.util.Locale
import java.util.Optional
import java.util.concurrent.ExecutionException
@@ -4404,8 +4406,15 @@ class ConversationFragment :
datePicker.addOnPositiveButtonClickListener { selectedDate ->
if (selectedDate != null) {
val localMidnightTimestamp = Instant.ofEpochMilli(selectedDate)
.atZone(ZoneId.systemDefault())
.toLocalDate()
.atStartOfDay(ZoneId.systemDefault())
.toInstant()
.toEpochMilli()
disposables += viewModel
.moveToDate(selectedDate)
.moveToDate(localMidnightTimestamp)
.observeOn(AndroidSchedulers.mainThread())
.subscribeBy { position ->
moveToPosition(position - 1)

37
app/src/main/java/org/thoughtcrime/securesms/conversation/v2/JumpToDateValidator.kt
View File

@@ -14,8 +14,9 @@ import org.signal.core.util.logging.Log
import org.thoughtcrime.securesms.database.SignalDatabase
import org.thoughtcrime.securesms.util.LRUCache
import java.time.Instant
import java.time.LocalDate
import java.time.LocalDateTime
import java.time.ZoneOffset
import java.time.ZoneId
import java.time.temporal.TemporalAdjusters
import java.util.concurrent.locks.Condition
import java.util.concurrent.locks.ReentrantLock
@@ -45,21 +46,31 @@ class JumpToDateValidator(val threadId: Long) : DateValidator {
private val cachedDates: MutableMap<Long, LookupState> = LRUCache(500)
init {
val startOfDay = LocalDateTime.now(ZoneOffset.UTC).withHour(0).withMinute(0).withSecond(0).withNano(0).toInstant(ZoneOffset.UTC).toEpochMilli()
val startOfDay = LocalDate.now(ZoneId.systemDefault())
.atStartOfDay(ZoneId.systemDefault())
.toInstant()
.toEpochMilli()
loadAround(startOfDay, allowPrefetch = true)
}
override fun isValid(dateStart: Long): Boolean {
return lock.withLock {
var value = cachedDates[dateStart]
val localMidnightTimestamp = Instant.ofEpochMilli(dateStart)
.atZone(ZoneId.systemDefault())
.toLocalDate()
.atStartOfDay(ZoneId.systemDefault())
.toInstant()
.toEpochMilli()
var value = cachedDates[localMidnightTimestamp]
while (value == null || value == LookupState.PENDING) {
loadAround(dateStart, allowPrefetch = true)
loadAround(localMidnightTimestamp, allowPrefetch = true)
condition.await()
value = cachedDates[dateStart]
value = cachedDates[localMidnightTimestamp]
}
cachedDates[dateStart] == LookupState.FOUND
cachedDates[localMidnightTimestamp] == LookupState.FOUND
}
}
@@ -68,18 +79,22 @@ class JumpToDateValidator(val threadId: Long) : DateValidator {
*/
private fun loadAround(dateStart: Long, allowPrefetch: Boolean) {
SignalExecutors.BOUNDED.execute {
val startOfDay = LocalDateTime.ofInstant(Instant.ofEpochMilli(dateStart), ZoneOffset.UTC)
val startOfDay = LocalDateTime.ofInstant(Instant.ofEpochMilli(dateStart), ZoneId.systemDefault())
val startOfMonth = startOfDay
.with(TemporalAdjusters.firstDayOfMonth())
.withHour(0).withMinute(0).withSecond(0).withNano(0)
.toInstant(ZoneOffset.UTC)
.atZone(ZoneId.systemDefault())
.toLocalDate()
.atStartOfDay(ZoneId.systemDefault())
.toInstant()
.toEpochMilli()
val endOfMonth = startOfDay
.with(TemporalAdjusters.lastDayOfMonth())
.withHour(0).withMinute(0).withSecond(0).withNano(0)
.toInstant(ZoneOffset.UTC)
.atZone(ZoneId.systemDefault())
.toLocalDate()
.atStartOfDay(ZoneId.systemDefault())
.toInstant()
.toEpochMilli()
val daysOfMonth = (startOfMonth..endOfMonth step 1.days.inWholeMilliseconds).toSet() + dateStart