2021-06-17 18:54:56 +02:00
|
|
|
/* Copyright 2021 Tusky Contributors
|
2019-02-12 19:22:37 +01:00
|
|
|
*
|
|
|
|
|
* This file is a part of Tusky.
|
|
|
|
|
*
|
|
|
|
|
* This program is free software; you can redistribute it and/or modify it under the terms of the
|
|
|
|
|
* GNU General Public License as published by the Free Software Foundation; either version 3 of the
|
|
|
|
|
* License, or (at your option) any later version.
|
|
|
|
|
*
|
|
|
|
|
* Tusky is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
|
|
|
|
|
* the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
|
|
|
|
|
* Public License for more details.
|
|
|
|
|
*
|
|
|
|
|
* You should have received a copy of the GNU General Public License along with Tusky; if not,
|
|
|
|
|
* see <http://www.gnu.org/licenses>. */
|
|
|
|
|
|
|
|
|
|
package com.keylesspalace.tusky.components.conversation
|
|
|
|
|
|
|
|
|
|
import androidx.room.Embedded
|
|
|
|
|
import androidx.room.Entity
|
|
|
|
|
import androidx.room.TypeConverters
|
|
|
|
|
import com.keylesspalace.tusky.db.Converters
|
2021-06-17 18:54:56 +02:00
|
|
|
import com.keylesspalace.tusky.entity.Attachment
|
|
|
|
|
import com.keylesspalace.tusky.entity.Conversation
|
|
|
|
|
import com.keylesspalace.tusky.entity.Emoji
|
2022-02-25 18:56:21 +01:00
|
|
|
import com.keylesspalace.tusky.entity.HashTag
|
2021-06-17 18:54:56 +02:00
|
|
|
import com.keylesspalace.tusky.entity.Poll
|
|
|
|
|
import com.keylesspalace.tusky.entity.Status
|
2022-03-15 21:34:57 +01:00
|
|
|
import com.keylesspalace.tusky.entity.TimelineAccount
|
2022-04-15 13:20:27 +02:00
|
|
|
import com.keylesspalace.tusky.viewdata.StatusViewData
|
Replace Gson library with Moshi (#4309)
**! ! Warning**: Do not merge before testing every API call and database
read involving JSON !
**Gson** is obsolete and has been superseded by **Moshi**. But more
importantly, parsing Kotlin objects using Gson is _dangerous_ because
Gson uses Java serialization and is **not Kotlin-aware**. This has two
main consequences:
- Fields of non-null types may end up null at runtime. Parsing will
succeed, but the code may crash later with a `NullPointerException` when
trying to access a field member;
- Default values of constructor parameters are always ignored. When
absent, reference types will be null, booleans will be false and
integers will be zero.
On the other hand, Kotlin-aware parsers like **Moshi** or **Kotlin
Serialization** will validate at parsing time that all received fields
comply with the Kotlin contract and avoid errors at runtime, making apps
more stable and schema mismatches easier to detect (as long as logs are
accessible):
- Receiving a null value for a non-null type will generate a parsing
error;
- Optional types are declared explicitly by adding a default value. **A
missing value with no default value declaration will generate a parsing
error.**
Migrating the entity declarations from Gson to Moshi will make the code
more robust but is not an easy task because of the semantic differences.
With Gson, both nullable and optional fields are represented with a null
value. After converting to Moshi, some nullable entities can become
non-null with a default value (if they are optional and not nullable),
others can stay nullable with no default value (if they are mandatory
and nullable), and others can become **nullable with a default value of
null** (if they are optional _or_ nullable _or_ both). That third option
is the safest bet when it's not clear if a field is optional or not,
except for lists which can usually be declared as non-null with a
default value of an empty list (I have yet to see a nullable array type
in the Mastodon API).
Fields that are currently declared as non-null present another
challenge. In theory, they should remain as-is and everything will work
fine. In practice, **because Gson is not aware of nullable types at
all**, it's possible that some non-null fields currently hold a null
value in some cases but the app does not report any error because the
field is not accessed by Kotlin code in that scenario. After migrating
to Moshi however, parsing such a field will now fail early if a null
value or no value is received.
These fields will have to be identified by heavily testing the app and
looking for parsing errors (`JsonDataException`) and/or by going through
the Mastodon documentation. A default value needs to be added for
missing optional fields, and their type could optionally be changed to
nullable, depending on the case.
Gson is also currently used to serialize and deserialize objects to and
from the local database, which is also challenging because backwards
compatibility needs to be preserved. Fortunately, by default Gson omits
writing null fields, so a field of type `List<T>?` could be replaced
with a field of type `List<T>` with a default value of `emptyList()` and
reading back the old data should still work. However, nullable lists
that are written directly (not as a field of another object) will still
be serialized to JSON as `"null"` so the deserializing code must still
be handling null properly.
Finally, changing the database schema is out of scope for this pull
request, so database entities that also happen to be serialized with
Gson will keep their original types even if they could be made non-null
as an improvement.
In the end this is all for the best, because the app will be more
reliable and errors will be easier to detect by showing up earlier with
a clear error message. Not to mention the performance benefits of using
Moshi compared to Gson.
- Replace Gson reflection with Moshi Kotlin codegen to generate all
parsers at compile time.
- Replace custom `Rfc3339DateJsonAdapter` with the one provided by
moshi-adapters.
- Replace custom `JsonDeserializer` classes for Enum types with
`EnumJsonAdapter.create(T).withUnknownFallback()` from moshi-adapters to
support fallback values.
- Replace `GuardedBooleanAdapter` with the more generic `GuardedAdapter`
which works with any type. Any nullable field may now be annotated with
`@Guarded`.
- Remove Proguard rules related to Json entities. Each Json entity needs
to be annotated with `@JsonClass` with no exception, and adding this
annotation will ensure that R8/Proguard will handle the entities
properly.
- Replace some nullable Boolean fields with non-null Boolean fields with
a default value where possible.
- Replace some nullable list fields with non-null list fields with a
default value of `emptyList()` where possible.
- Update `TimelineDao` to perform all Json conversions internally using
`Converters` so no Gson or Moshi instance has to be passed to its
methods.
- ~~Create a custom `DraftAttachmentJsonAdapter` to serialize and
deserialize `DraftAttachment` which is a special entity that supports
more than one json name per field. A custom adapter is necessary because
there is not direct equivalent of `@SerializedName(alternate = [...])`
in Moshi.~~ Remove alternate names for some `DraftAttachment` fields
which were used as a workaround to deserialize local data in 2-years old
builds of Tusky.
- Update tests to make them work with Moshi.
- Simplify a few `equals()` implementations.
- Change a few functions to `val`s
- Turn `NetworkModule` into an `object` (since it contains no abstract
methods).
Please test the app thoroughly before merging. There may be some fields
currently declared as mandatory that are actually optional.
2024-04-02 21:01:04 +02:00
|
|
|
import com.squareup.moshi.JsonClass
|
2021-06-17 18:54:56 +02:00
|
|
|
import java.util.Date
|
2019-02-12 19:22:37 +01:00
|
|
|
|
2021-06-28 21:13:24 +02:00
|
|
|
@Entity(primaryKeys = ["id", "accountId"])
|
2019-02-12 19:22:37 +01:00
|
|
|
@TypeConverters(Converters::class)
|
|
|
|
|
data class ConversationEntity(
|
2021-06-17 18:54:56 +02:00
|
|
|
val accountId: Long,
|
|
|
|
|
val id: String,
|
2022-05-30 19:06:14 +02:00
|
|
|
val order: Int,
|
2021-06-17 18:54:56 +02:00
|
|
|
val accounts: List<ConversationAccountEntity>,
|
|
|
|
|
val unread: Boolean,
|
|
|
|
|
@Embedded(prefix = "s_") val lastStatus: ConversationStatusEntity
|
2022-04-15 13:20:27 +02:00
|
|
|
) {
|
|
|
|
|
fun toViewData(): ConversationViewData {
|
|
|
|
|
return ConversationViewData(
|
|
|
|
|
id = id,
|
2022-05-30 19:06:14 +02:00
|
|
|
order = order,
|
2022-04-15 13:20:27 +02:00
|
|
|
accounts = accounts,
|
|
|
|
|
unread = unread,
|
|
|
|
|
lastStatus = lastStatus.toViewData()
|
|
|
|
|
)
|
|
|
|
|
}
|
|
|
|
|
}
|
2019-02-12 19:22:37 +01:00
|
|
|
|
Replace Gson library with Moshi (#4309)
**! ! Warning**: Do not merge before testing every API call and database
read involving JSON !
**Gson** is obsolete and has been superseded by **Moshi**. But more
importantly, parsing Kotlin objects using Gson is _dangerous_ because
Gson uses Java serialization and is **not Kotlin-aware**. This has two
main consequences:
- Fields of non-null types may end up null at runtime. Parsing will
succeed, but the code may crash later with a `NullPointerException` when
trying to access a field member;
- Default values of constructor parameters are always ignored. When
absent, reference types will be null, booleans will be false and
integers will be zero.
On the other hand, Kotlin-aware parsers like **Moshi** or **Kotlin
Serialization** will validate at parsing time that all received fields
comply with the Kotlin contract and avoid errors at runtime, making apps
more stable and schema mismatches easier to detect (as long as logs are
accessible):
- Receiving a null value for a non-null type will generate a parsing
error;
- Optional types are declared explicitly by adding a default value. **A
missing value with no default value declaration will generate a parsing
error.**
Migrating the entity declarations from Gson to Moshi will make the code
more robust but is not an easy task because of the semantic differences.
With Gson, both nullable and optional fields are represented with a null
value. After converting to Moshi, some nullable entities can become
non-null with a default value (if they are optional and not nullable),
others can stay nullable with no default value (if they are mandatory
and nullable), and others can become **nullable with a default value of
null** (if they are optional _or_ nullable _or_ both). That third option
is the safest bet when it's not clear if a field is optional or not,
except for lists which can usually be declared as non-null with a
default value of an empty list (I have yet to see a nullable array type
in the Mastodon API).
Fields that are currently declared as non-null present another
challenge. In theory, they should remain as-is and everything will work
fine. In practice, **because Gson is not aware of nullable types at
all**, it's possible that some non-null fields currently hold a null
value in some cases but the app does not report any error because the
field is not accessed by Kotlin code in that scenario. After migrating
to Moshi however, parsing such a field will now fail early if a null
value or no value is received.
These fields will have to be identified by heavily testing the app and
looking for parsing errors (`JsonDataException`) and/or by going through
the Mastodon documentation. A default value needs to be added for
missing optional fields, and their type could optionally be changed to
nullable, depending on the case.
Gson is also currently used to serialize and deserialize objects to and
from the local database, which is also challenging because backwards
compatibility needs to be preserved. Fortunately, by default Gson omits
writing null fields, so a field of type `List<T>?` could be replaced
with a field of type `List<T>` with a default value of `emptyList()` and
reading back the old data should still work. However, nullable lists
that are written directly (not as a field of another object) will still
be serialized to JSON as `"null"` so the deserializing code must still
be handling null properly.
Finally, changing the database schema is out of scope for this pull
request, so database entities that also happen to be serialized with
Gson will keep their original types even if they could be made non-null
as an improvement.
In the end this is all for the best, because the app will be more
reliable and errors will be easier to detect by showing up earlier with
a clear error message. Not to mention the performance benefits of using
Moshi compared to Gson.
- Replace Gson reflection with Moshi Kotlin codegen to generate all
parsers at compile time.
- Replace custom `Rfc3339DateJsonAdapter` with the one provided by
moshi-adapters.
- Replace custom `JsonDeserializer` classes for Enum types with
`EnumJsonAdapter.create(T).withUnknownFallback()` from moshi-adapters to
support fallback values.
- Replace `GuardedBooleanAdapter` with the more generic `GuardedAdapter`
which works with any type. Any nullable field may now be annotated with
`@Guarded`.
- Remove Proguard rules related to Json entities. Each Json entity needs
to be annotated with `@JsonClass` with no exception, and adding this
annotation will ensure that R8/Proguard will handle the entities
properly.
- Replace some nullable Boolean fields with non-null Boolean fields with
a default value where possible.
- Replace some nullable list fields with non-null list fields with a
default value of `emptyList()` where possible.
- Update `TimelineDao` to perform all Json conversions internally using
`Converters` so no Gson or Moshi instance has to be passed to its
methods.
- ~~Create a custom `DraftAttachmentJsonAdapter` to serialize and
deserialize `DraftAttachment` which is a special entity that supports
more than one json name per field. A custom adapter is necessary because
there is not direct equivalent of `@SerializedName(alternate = [...])`
in Moshi.~~ Remove alternate names for some `DraftAttachment` fields
which were used as a workaround to deserialize local data in 2-years old
builds of Tusky.
- Update tests to make them work with Moshi.
- Simplify a few `equals()` implementations.
- Change a few functions to `val`s
- Turn `NetworkModule` into an `object` (since it contains no abstract
methods).
Please test the app thoroughly before merging. There may be some fields
currently declared as mandatory that are actually optional.
2024-04-02 21:01:04 +02:00
|
|
|
@JsonClass(generateAdapter = true)
|
2019-02-12 19:22:37 +01:00
|
|
|
data class ConversationAccountEntity(
|
2021-06-17 18:54:56 +02:00
|
|
|
val id: String,
|
2022-05-30 19:06:14 +02:00
|
|
|
val localUsername: String,
|
2021-06-17 18:54:56 +02:00
|
|
|
val username: String,
|
|
|
|
|
val displayName: String,
|
|
|
|
|
val avatar: String,
|
|
|
|
|
val emojis: List<Emoji>
|
2019-02-12 19:22:37 +01:00
|
|
|
) {
|
2022-03-15 21:34:57 +01:00
|
|
|
fun toAccount(): TimelineAccount {
|
|
|
|
|
return TimelineAccount(
|
2021-06-17 18:54:56 +02:00
|
|
|
id = id,
|
2022-05-30 19:06:14 +02:00
|
|
|
localUsername = localUsername,
|
2021-06-17 18:54:56 +02:00
|
|
|
username = username,
|
|
|
|
|
displayName = displayName,
|
2023-04-24 12:09:34 +02:00
|
|
|
note = "",
|
2022-03-15 21:34:57 +01:00
|
|
|
url = "",
|
2021-06-17 18:54:56 +02:00
|
|
|
avatar = avatar,
|
2023-03-13 13:16:39 +01:00
|
|
|
emojis = emojis
|
2019-02-12 19:22:37 +01:00
|
|
|
)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@TypeConverters(Converters::class)
|
|
|
|
|
data class ConversationStatusEntity(
|
2021-06-17 18:54:56 +02:00
|
|
|
val id: String,
|
|
|
|
|
val url: String?,
|
|
|
|
|
val inReplyToId: String?,
|
|
|
|
|
val inReplyToAccountId: String?,
|
|
|
|
|
val account: ConversationAccountEntity,
|
2022-04-15 13:20:27 +02:00
|
|
|
val content: String,
|
2021-06-17 18:54:56 +02:00
|
|
|
val createdAt: Date,
|
2022-12-03 12:15:54 +01:00
|
|
|
val editedAt: Date?,
|
2021-06-17 18:54:56 +02:00
|
|
|
val emojis: List<Emoji>,
|
|
|
|
|
val favouritesCount: Int,
|
2022-05-20 16:47:45 +02:00
|
|
|
val repliesCount: Int,
|
2021-06-17 18:54:56 +02:00
|
|
|
val favourited: Boolean,
|
|
|
|
|
val bookmarked: Boolean,
|
|
|
|
|
val sensitive: Boolean,
|
|
|
|
|
val spoilerText: String,
|
2023-06-29 18:37:46 +02:00
|
|
|
val attachments: List<Attachment>,
|
2021-06-17 18:54:56 +02:00
|
|
|
val mentions: List<Status.Mention>,
|
2022-02-27 20:16:41 +01:00
|
|
|
val tags: List<HashTag>?,
|
2021-06-17 18:54:56 +02:00
|
|
|
val showingHiddenContent: Boolean,
|
|
|
|
|
val expanded: Boolean,
|
|
|
|
|
val collapsed: Boolean,
|
|
|
|
|
val muted: Boolean,
|
2022-08-31 18:53:57 +02:00
|
|
|
val poll: Poll?,
|
2023-03-13 13:16:39 +01:00
|
|
|
val language: String?
|
2019-02-12 19:22:37 +01:00
|
|
|
) {
|
|
|
|
|
|
2022-04-15 13:20:27 +02:00
|
|
|
fun toViewData(): StatusViewData.Concrete {
|
|
|
|
|
return StatusViewData.Concrete(
|
|
|
|
|
status = Status(
|
|
|
|
|
id = id,
|
|
|
|
|
url = url,
|
|
|
|
|
account = account.toAccount(),
|
|
|
|
|
inReplyToId = inReplyToId,
|
|
|
|
|
inReplyToAccountId = inReplyToAccountId,
|
|
|
|
|
content = content,
|
|
|
|
|
reblog = null,
|
|
|
|
|
createdAt = createdAt,
|
2022-12-03 12:15:54 +01:00
|
|
|
editedAt = editedAt,
|
2022-04-15 13:20:27 +02:00
|
|
|
emojis = emojis,
|
|
|
|
|
reblogsCount = 0,
|
|
|
|
|
favouritesCount = favouritesCount,
|
2022-05-20 16:47:45 +02:00
|
|
|
repliesCount = repliesCount,
|
2022-04-15 13:20:27 +02:00
|
|
|
reblogged = false,
|
|
|
|
|
favourited = favourited,
|
|
|
|
|
bookmarked = bookmarked,
|
|
|
|
|
sensitive = sensitive,
|
|
|
|
|
spoilerText = spoilerText,
|
|
|
|
|
visibility = Status.Visibility.DIRECT,
|
|
|
|
|
attachments = attachments,
|
|
|
|
|
mentions = mentions,
|
|
|
|
|
tags = tags,
|
|
|
|
|
application = null,
|
|
|
|
|
pinned = false,
|
|
|
|
|
muted = muted,
|
|
|
|
|
poll = poll,
|
2022-08-31 18:53:57 +02:00
|
|
|
card = null,
|
|
|
|
|
language = language,
|
Replace Gson library with Moshi (#4309)
**! ! Warning**: Do not merge before testing every API call and database
read involving JSON !
**Gson** is obsolete and has been superseded by **Moshi**. But more
importantly, parsing Kotlin objects using Gson is _dangerous_ because
Gson uses Java serialization and is **not Kotlin-aware**. This has two
main consequences:
- Fields of non-null types may end up null at runtime. Parsing will
succeed, but the code may crash later with a `NullPointerException` when
trying to access a field member;
- Default values of constructor parameters are always ignored. When
absent, reference types will be null, booleans will be false and
integers will be zero.
On the other hand, Kotlin-aware parsers like **Moshi** or **Kotlin
Serialization** will validate at parsing time that all received fields
comply with the Kotlin contract and avoid errors at runtime, making apps
more stable and schema mismatches easier to detect (as long as logs are
accessible):
- Receiving a null value for a non-null type will generate a parsing
error;
- Optional types are declared explicitly by adding a default value. **A
missing value with no default value declaration will generate a parsing
error.**
Migrating the entity declarations from Gson to Moshi will make the code
more robust but is not an easy task because of the semantic differences.
With Gson, both nullable and optional fields are represented with a null
value. After converting to Moshi, some nullable entities can become
non-null with a default value (if they are optional and not nullable),
others can stay nullable with no default value (if they are mandatory
and nullable), and others can become **nullable with a default value of
null** (if they are optional _or_ nullable _or_ both). That third option
is the safest bet when it's not clear if a field is optional or not,
except for lists which can usually be declared as non-null with a
default value of an empty list (I have yet to see a nullable array type
in the Mastodon API).
Fields that are currently declared as non-null present another
challenge. In theory, they should remain as-is and everything will work
fine. In practice, **because Gson is not aware of nullable types at
all**, it's possible that some non-null fields currently hold a null
value in some cases but the app does not report any error because the
field is not accessed by Kotlin code in that scenario. After migrating
to Moshi however, parsing such a field will now fail early if a null
value or no value is received.
These fields will have to be identified by heavily testing the app and
looking for parsing errors (`JsonDataException`) and/or by going through
the Mastodon documentation. A default value needs to be added for
missing optional fields, and their type could optionally be changed to
nullable, depending on the case.
Gson is also currently used to serialize and deserialize objects to and
from the local database, which is also challenging because backwards
compatibility needs to be preserved. Fortunately, by default Gson omits
writing null fields, so a field of type `List<T>?` could be replaced
with a field of type `List<T>` with a default value of `emptyList()` and
reading back the old data should still work. However, nullable lists
that are written directly (not as a field of another object) will still
be serialized to JSON as `"null"` so the deserializing code must still
be handling null properly.
Finally, changing the database schema is out of scope for this pull
request, so database entities that also happen to be serialized with
Gson will keep their original types even if they could be made non-null
as an improvement.
In the end this is all for the best, because the app will be more
reliable and errors will be easier to detect by showing up earlier with
a clear error message. Not to mention the performance benefits of using
Moshi compared to Gson.
- Replace Gson reflection with Moshi Kotlin codegen to generate all
parsers at compile time.
- Replace custom `Rfc3339DateJsonAdapter` with the one provided by
moshi-adapters.
- Replace custom `JsonDeserializer` classes for Enum types with
`EnumJsonAdapter.create(T).withUnknownFallback()` from moshi-adapters to
support fallback values.
- Replace `GuardedBooleanAdapter` with the more generic `GuardedAdapter`
which works with any type. Any nullable field may now be annotated with
`@Guarded`.
- Remove Proguard rules related to Json entities. Each Json entity needs
to be annotated with `@JsonClass` with no exception, and adding this
annotation will ensure that R8/Proguard will handle the entities
properly.
- Replace some nullable Boolean fields with non-null Boolean fields with
a default value where possible.
- Replace some nullable list fields with non-null list fields with a
default value of `emptyList()` where possible.
- Update `TimelineDao` to perform all Json conversions internally using
`Converters` so no Gson or Moshi instance has to be passed to its
methods.
- ~~Create a custom `DraftAttachmentJsonAdapter` to serialize and
deserialize `DraftAttachment` which is a special entity that supports
more than one json name per field. A custom adapter is necessary because
there is not direct equivalent of `@SerializedName(alternate = [...])`
in Moshi.~~ Remove alternate names for some `DraftAttachment` fields
which were used as a workaround to deserialize local data in 2-years old
builds of Tusky.
- Update tests to make them work with Moshi.
- Simplify a few `equals()` implementations.
- Change a few functions to `val`s
- Turn `NetworkModule` into an `object` (since it contains no abstract
methods).
Please test the app thoroughly before merging. There may be some fields
currently declared as mandatory that are actually optional.
2024-04-02 21:01:04 +02:00
|
|
|
filtered = emptyList()
|
2022-04-15 13:20:27 +02:00
|
|
|
),
|
|
|
|
|
isExpanded = expanded,
|
|
|
|
|
isShowingContent = showingHiddenContent,
|
2023-03-13 13:16:39 +01:00
|
|
|
isCollapsed = collapsed
|
2021-06-28 21:13:24 +02:00
|
|
|
)
|
2019-02-12 19:22:37 +01:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2024-01-04 17:00:55 +01:00
|
|
|
fun TimelineAccount.toEntity() = ConversationAccountEntity(
|
|
|
|
|
id = id,
|
|
|
|
|
localUsername = localUsername,
|
|
|
|
|
username = username,
|
|
|
|
|
displayName = name,
|
|
|
|
|
avatar = avatar,
|
|
|
|
|
emojis = emojis.orEmpty()
|
|
|
|
|
)
|
2019-02-12 19:22:37 +01:00
|
|
|
|
2024-01-04 17:00:55 +01:00
|
|
|
fun Status.toEntity(expanded: Boolean, contentShowing: Boolean, contentCollapsed: Boolean) =
|
2021-06-17 18:54:56 +02:00
|
|
|
ConversationStatusEntity(
|
|
|
|
|
id = id,
|
|
|
|
|
url = url,
|
|
|
|
|
inReplyToId = inReplyToId,
|
|
|
|
|
inReplyToAccountId = inReplyToAccountId,
|
|
|
|
|
account = account.toEntity(),
|
|
|
|
|
content = content,
|
|
|
|
|
createdAt = createdAt,
|
2022-12-03 12:15:54 +01:00
|
|
|
editedAt = editedAt,
|
2021-06-17 18:54:56 +02:00
|
|
|
emojis = emojis,
|
|
|
|
|
favouritesCount = favouritesCount,
|
2022-05-20 16:47:45 +02:00
|
|
|
repliesCount = repliesCount,
|
2021-06-17 18:54:56 +02:00
|
|
|
favourited = favourited,
|
|
|
|
|
bookmarked = bookmarked,
|
|
|
|
|
sensitive = sensitive,
|
|
|
|
|
spoilerText = spoilerText,
|
|
|
|
|
attachments = attachments,
|
|
|
|
|
mentions = mentions,
|
2022-02-25 18:56:21 +01:00
|
|
|
tags = tags,
|
2022-11-22 20:11:30 +01:00
|
|
|
showingHiddenContent = contentShowing,
|
|
|
|
|
expanded = expanded,
|
|
|
|
|
collapsed = contentCollapsed,
|
Replace Gson library with Moshi (#4309)
**! ! Warning**: Do not merge before testing every API call and database
read involving JSON !
**Gson** is obsolete and has been superseded by **Moshi**. But more
importantly, parsing Kotlin objects using Gson is _dangerous_ because
Gson uses Java serialization and is **not Kotlin-aware**. This has two
main consequences:
- Fields of non-null types may end up null at runtime. Parsing will
succeed, but the code may crash later with a `NullPointerException` when
trying to access a field member;
- Default values of constructor parameters are always ignored. When
absent, reference types will be null, booleans will be false and
integers will be zero.
On the other hand, Kotlin-aware parsers like **Moshi** or **Kotlin
Serialization** will validate at parsing time that all received fields
comply with the Kotlin contract and avoid errors at runtime, making apps
more stable and schema mismatches easier to detect (as long as logs are
accessible):
- Receiving a null value for a non-null type will generate a parsing
error;
- Optional types are declared explicitly by adding a default value. **A
missing value with no default value declaration will generate a parsing
error.**
Migrating the entity declarations from Gson to Moshi will make the code
more robust but is not an easy task because of the semantic differences.
With Gson, both nullable and optional fields are represented with a null
value. After converting to Moshi, some nullable entities can become
non-null with a default value (if they are optional and not nullable),
others can stay nullable with no default value (if they are mandatory
and nullable), and others can become **nullable with a default value of
null** (if they are optional _or_ nullable _or_ both). That third option
is the safest bet when it's not clear if a field is optional or not,
except for lists which can usually be declared as non-null with a
default value of an empty list (I have yet to see a nullable array type
in the Mastodon API).
Fields that are currently declared as non-null present another
challenge. In theory, they should remain as-is and everything will work
fine. In practice, **because Gson is not aware of nullable types at
all**, it's possible that some non-null fields currently hold a null
value in some cases but the app does not report any error because the
field is not accessed by Kotlin code in that scenario. After migrating
to Moshi however, parsing such a field will now fail early if a null
value or no value is received.
These fields will have to be identified by heavily testing the app and
looking for parsing errors (`JsonDataException`) and/or by going through
the Mastodon documentation. A default value needs to be added for
missing optional fields, and their type could optionally be changed to
nullable, depending on the case.
Gson is also currently used to serialize and deserialize objects to and
from the local database, which is also challenging because backwards
compatibility needs to be preserved. Fortunately, by default Gson omits
writing null fields, so a field of type `List<T>?` could be replaced
with a field of type `List<T>` with a default value of `emptyList()` and
reading back the old data should still work. However, nullable lists
that are written directly (not as a field of another object) will still
be serialized to JSON as `"null"` so the deserializing code must still
be handling null properly.
Finally, changing the database schema is out of scope for this pull
request, so database entities that also happen to be serialized with
Gson will keep their original types even if they could be made non-null
as an improvement.
In the end this is all for the best, because the app will be more
reliable and errors will be easier to detect by showing up earlier with
a clear error message. Not to mention the performance benefits of using
Moshi compared to Gson.
- Replace Gson reflection with Moshi Kotlin codegen to generate all
parsers at compile time.
- Replace custom `Rfc3339DateJsonAdapter` with the one provided by
moshi-adapters.
- Replace custom `JsonDeserializer` classes for Enum types with
`EnumJsonAdapter.create(T).withUnknownFallback()` from moshi-adapters to
support fallback values.
- Replace `GuardedBooleanAdapter` with the more generic `GuardedAdapter`
which works with any type. Any nullable field may now be annotated with
`@Guarded`.
- Remove Proguard rules related to Json entities. Each Json entity needs
to be annotated with `@JsonClass` with no exception, and adding this
annotation will ensure that R8/Proguard will handle the entities
properly.
- Replace some nullable Boolean fields with non-null Boolean fields with
a default value where possible.
- Replace some nullable list fields with non-null list fields with a
default value of `emptyList()` where possible.
- Update `TimelineDao` to perform all Json conversions internally using
`Converters` so no Gson or Moshi instance has to be passed to its
methods.
- ~~Create a custom `DraftAttachmentJsonAdapter` to serialize and
deserialize `DraftAttachment` which is a special entity that supports
more than one json name per field. A custom adapter is necessary because
there is not direct equivalent of `@SerializedName(alternate = [...])`
in Moshi.~~ Remove alternate names for some `DraftAttachment` fields
which were used as a workaround to deserialize local data in 2-years old
builds of Tusky.
- Update tests to make them work with Moshi.
- Simplify a few `equals()` implementations.
- Change a few functions to `val`s
- Turn `NetworkModule` into an `object` (since it contains no abstract
methods).
Please test the app thoroughly before merging. There may be some fields
currently declared as mandatory that are actually optional.
2024-04-02 21:01:04 +02:00
|
|
|
muted = muted,
|
2022-08-31 18:53:57 +02:00
|
|
|
poll = poll,
|
2023-03-13 13:16:39 +01:00
|
|
|
language = language
|
2021-06-17 18:54:56 +02:00
|
|
|
)
|
2019-02-12 19:22:37 +01:00
|
|
|
|
2022-11-22 20:11:30 +01:00
|
|
|
fun Conversation.toEntity(
|
|
|
|
|
accountId: Long,
|
|
|
|
|
order: Int,
|
|
|
|
|
expanded: Boolean,
|
|
|
|
|
contentShowing: Boolean,
|
|
|
|
|
contentCollapsed: Boolean
|
2024-01-04 17:00:55 +01:00
|
|
|
) = ConversationEntity(
|
|
|
|
|
accountId = accountId,
|
|
|
|
|
id = id,
|
|
|
|
|
order = order,
|
|
|
|
|
accounts = accounts.map { it.toEntity() },
|
|
|
|
|
unread = unread,
|
|
|
|
|
lastStatus = lastStatus!!.toEntity(
|
|
|
|
|
expanded = expanded,
|
|
|
|
|
contentShowing = contentShowing,
|
|
|
|
|
contentCollapsed = contentCollapsed
|
2021-06-17 18:54:56 +02:00
|
|
|
)
|
2024-01-04 17:00:55 +01:00
|
|
|
)
|
