Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
FreshRSS-Android
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
30
Issues
30
List
Boards
Labels
Service Desk
Milestones
Merge Requests
2
Merge Requests
2
Requirements
Requirements
List
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Environments
Packages & Registries
Packages & Registries
Package Registry
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Christophe Henry
FreshRSS-Android
Commits
8cfcd932
Commit
8cfcd932
authored
Mar 14, 2019
by
Christophe Henry
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix handle absent newestItemTimestampUsec when unread counts are returned
parent
0c1b5e76
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
54 additions
and
8 deletions
+54
-8
app/src/main/java/fr/chenry/android/freshrss/store/api/models/UnreadCounts.kt
.../chenry/android/freshrss/store/api/models/UnreadCounts.kt
+1
-1
app/src/main/java/fr/chenry/android/freshrss/utils/KotlinExtensions.kt
...java/fr/chenry/android/freshrss/utils/KotlinExtensions.kt
+5
-7
app/src/test/java/fr/chenry/android/freshrss/store/api/models/UnreadCountTest.kt
...enry/android/freshrss/store/api/models/UnreadCountTest.kt
+48
-0
No files found.
app/src/main/java/fr/chenry/android/freshrss/store/api/models/UnreadCounts.kt
View file @
8cfcd932
...
...
@@ -13,7 +13,7 @@ data class UnreadCount(
val
id
:
String
,
val
count
:
Int
,
@JsonDeserialize
(
using
=
MicroSecTimestampDeserializer
::
class
)
val
newestItemTimestampUsec
:
LocalDateTime
val
newestItemTimestampUsec
:
LocalDateTime
=
LocalDateTime
.
now
()
)
class
MicroSecTimestampDeserializer
:
LocalDateTimeDeserializer
()
{
...
...
app/src/main/java/fr/chenry/android/freshrss/utils/KotlinExtensions.kt
View file @
8cfcd932
...
...
@@ -20,6 +20,10 @@ import org.apache.commons.text.StringEscapeUtils
import
org.apache.commons.text.WordUtils
import
kotlin.reflect.full.companionObjectInstance
val
JACKSON_OBJECT_MAPPER
=
ObjectMapper
().
registerKotlinModule
()
.
configure
(
DeserializationFeature
.
FAIL_ON_UNKNOWN_PROPERTIES
,
false
)
.
registerModule
(
JodaModule
())
inline
fun
<
reified
T
:
Any
>
Request
.
promiseWithSerializer
(
loader
:
ResponseDeserializable
<
T
>?
=
null
):
Promise
<
T
,
Exception
>
{
...
...
@@ -37,13 +41,7 @@ inline fun <reified T: Any> Request.promiseWithSerializer(
return
asyncRequest
{
responseObject
(
finalLoader
)}
}
inline
fun
<
reified
T
:
Any
>
Request
.
promise
()
=
asyncRequest
{
responseObject
<
T
>(
ObjectMapper
().
registerKotlinModule
()
.
configure
(
DeserializationFeature
.
FAIL_ON_UNKNOWN_PROPERTIES
,
false
)
.
registerModule
(
JodaModule
())
)
}
inline
fun
<
reified
T
:
Any
>
Request
.
promise
()
=
asyncRequest
{
responseObject
<
T
>(
JACKSON_OBJECT_MAPPER
)}
fun
Request
.
promiseString
()
=
asyncRequest
{
responseString
()}
...
...
app/src/test/java/fr/chenry/android/freshrss/store/api/models/UnreadCountTest.kt
0 → 100644
View file @
8cfcd932
package
fr.chenry.android.freshrss.store.api.models
import
fr.chenry.android.freshrss.utils.JACKSON_OBJECT_MAPPER
import
org.joda.time.*
import
org.junit.*
import
org.junit.Assert.assertEquals
class
UnreadCountTest
{
@Before
fun
setUp
()
{
DateTimeUtils
.
setCurrentMillisFixed
(
System
.
currentTimeMillis
())
}
@After
fun
tearDown
()
{
DateTimeUtils
.
setCurrentMillisSystem
()
}
@Test
fun
testDeserialize
()
{
val
value
=
JACKSON_OBJECT_MAPPER
.
readValue
(
"""
{
"id": "feed/3",
"count": 0,
"newestItemTimestampUsec": "1552432206000000"
}
"""
.
trimIndent
(),
UnreadCount
::
class
.
java
)
assertEquals
(
UnreadCount
(
"feed/3"
,
0
,
LocalDateTime
(
"1552432206000000"
.
toLong
().
div
(
1000
),
DateTimeZone
.
UTC
)),
value
)
}
@Test
fun
testDeserializeWithNullTimestamp
()
{
val
value
=
JACKSON_OBJECT_MAPPER
.
readValue
(
"""
{
"id": "feed/3",
"count": 0
}
"""
.
trimIndent
(),
UnreadCount
::
class
.
java
)
assertEquals
(
UnreadCount
(
"feed/3"
,
0
,
LocalDateTime
.
now
()),
value
)
}
}
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment