Sulkta-OSS/straw
3
0
Fork 0
Code Issues 1 Pull requests 9 Projects Releases Packages Wiki Activity Actions

Merge pull request #8747 from Isira-Seneviratne/Range_limit

Browse source 
Use range-limiting methods in more places.
This commit is contained in:
Stypox 2022-10-28 10:34:04 +02:00 • committed by GitHub
commit fd1237698d
4 changed files with 11 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

14
app/src/main/java/org/schabi/newpipe/util/ReleaseVersionUtil.kt
View file

@ -100,13 +100,11 @@ object ReleaseVersionUtil {
* @return Epoch second of expiry date time
*/
fun coerceUpdateCheckExpiry(expiryString: String?): Long {
val now = ZonedDateTime.now()
return expiryString?.let {
var expiry =
ZonedDateTime.from(DateTimeFormatter.RFC_1123_DATE_TIME.parse(expiryString))
expiry = maxOf(expiry, now.plusHours(6))
expiry = minOf(expiry, now.plusHours(72))
expiry.toEpochSecond()
} ?: now.plusHours(6).toEpochSecond()
val nowPlus6Hours = ZonedDateTime.now().plusHours(6)
val expiry = expiryString?.let {
ZonedDateTime.from(DateTimeFormatter.RFC_1123_DATE_TIME.parse(it))
.coerceIn(nowPlus6Hours, nowPlus6Hours.plusHours(66))
} ?: nowPlus6Hours
return expiry.toEpochSecond()
}
}