Replace Gson library with Moshi

app/build.gradle

@@ -142,7 +142,8 @@ dependencies {
 
     implementation libs.android.material
 
-    implementation libs.gson
+    implementation libs.bundles.moshi
+    ksp libs.moshi.kotlin.codegen
 
     implementation libs.bundles.retrofit
     implementation libs.networkresult.calladapter

app/proguard-rules.pro

@@ -39,34 +39,6 @@
 
 # TUSKY SPECIFIC OPTIONS
 
-# keep members of our model classes, they are used in json de/serialization
--keepclassmembers class com.keylesspalace.tusky.entity.* { *; }
-
--keep public enum com.keylesspalace.tusky.entity.*$** {
-    **[] $VALUES;
-    public *;
-}
-
--keepclassmembers class com.keylesspalace.tusky.components.conversation.ConversationAccountEntity { *; }
--keepclassmembers class com.keylesspalace.tusky.db.DraftAttachment { *; }
-
--keep enum com.keylesspalace.tusky.db.DraftAttachment$Type {
-    public *;
-}
-
-# https://github.com/google/gson/blob/master/examples/android-proguard-example/proguard.cfg
-
-# Prevent proguard from stripping interface information from TypeAdapter, TypeAdapterFactory,
-# JsonSerializer, JsonDeserializer instances (so they can be used in @JsonAdapter)
--keep class * extends com.google.gson.TypeAdapter
--keep class * implements com.google.gson.TypeAdapterFactory
--keep class * implements com.google.gson.JsonSerializer
--keep class * implements com.google.gson.JsonDeserializer
-
-# Retain generic signatures of TypeToken and its subclasses with R8 version 3.0 and higher.
--keep,allowobfuscation,allowshrinking class com.google.gson.reflect.TypeToken
--keep,allowobfuscation,allowshrinking class * extends com.google.gson.reflect.TypeToken
-
 # Retain generic signatures of classes used in MastodonApi so Retrofit works
 -keep,allowobfuscation,allowshrinking class retrofit2.Response
 -keep,allowobfuscation,allowshrinking class kotlin.collections.List

app/src/main/java/com/keylesspalace/tusky/adapter/EmojiAdapter.kt

@@ -31,7 +31,7 @@ class EmojiAdapter(
     private val animate: Boolean
 ) : RecyclerView.Adapter<BindingHolder<ItemEmojiButtonBinding>>() {
 
-    private val emojiList: List<Emoji> = emojiList.filter { emoji -> emoji.visibleInPicker == null || emoji.visibleInPicker }
+    private val emojiList: List<Emoji> = emojiList.filter { emoji -> emoji.visibleInPicker }
         .sortedBy { it.shortcode.lowercase(Locale.ROOT) }
 
     override fun getItemCount() = emojiList.size

app/src/main/java/com/keylesspalace/tusky/adapter/ReportNotificationViewHolder.kt

@@ -54,7 +54,7 @@ class ReportNotificationViewHolder(
 
         binding.notificationTopText.setCompoundDrawablesWithIntrinsicBounds(icon, null, null, null)
         binding.notificationTopText.text = itemView.context.getString(R.string.notification_header_report_format, reporterName, reporteeName)
-        binding.notificationSummary.text = itemView.context.getString(R.string.notification_summary_report_format, getRelativeTimeSpanString(itemView.context, report.createdAt.time, Date().time), report.status_ids?.size ?: 0)
+        binding.notificationSummary.text = itemView.context.getString(R.string.notification_summary_report_format, getRelativeTimeSpanString(itemView.context, report.createdAt.time, Date().time), report.status_ids.size)
         binding.notificationCategory.text = getTranslatedCategory(itemView.context, report.category)
 
         // Fancy avatar inset

app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java

@@ -802,7 +802,7 @@ public void setupWithStatus(@NonNull StatusViewData.Concrete status,
 
             setupButtons(listener, actionable.getAccount().getId(), status.getContent().toString(),
                 statusDisplayOptions);
-            setRebloggingEnabled(actionable.rebloggingAllowed(), actionable.getVisibility());
+            setRebloggingEnabled(actionable.isRebloggingAllowed(), actionable.getVisibility());
 
             setSpoilerAndContent(status, statusDisplayOptions, listener);
 

app/src/main/java/com/keylesspalace/tusky/appstore/CacheUpdater.kt

@@ -1,6 +1,5 @@
 package com.keylesspalace.tusky.appstore
 
-import com.google.gson.Gson
 import com.keylesspalace.tusky.db.AccountManager
 import com.keylesspalace.tusky.db.AppDatabase
 import javax.inject.Inject
@@ -13,8 +12,7 @@ import kotlinx.coroutines.launch
 class CacheUpdater @Inject constructor(
     eventHub: EventHub,
     accountManager: AccountManager,
-    appDatabase: AppDatabase,
-    gson: Gson
+    appDatabase: AppDatabase
 ) {
 
     private val scope = CoroutineScope(Dispatchers.IO + SupervisorJob())
@@ -30,17 +28,15 @@ class CacheUpdater @Inject constructor(
                         val status = event.status
                         timelineDao.update(
                             accountId = accountId,
-                            status = status,
-                            gson = gson
+                            status = status
                         )
                     }
                     is UnfollowEvent ->
                         timelineDao.removeAllByUser(accountId, event.accountId)
                     is StatusDeletedEvent ->
                         timelineDao.delete(accountId, event.statusId)
                     is PollVoteEvent -> {
-                        val pollString = gson.toJson(event.poll)
-                        timelineDao.setVoted(accountId, event.statusId, pollString)
+                        timelineDao.setVoted(accountId, event.statusId, event.poll)
                     }
                 }
             }

app/src/main/java/com/keylesspalace/tusky/components/account/AccountActivity.kt

@@ -518,8 +518,8 @@ class AccountActivity : BottomSheetActivity(), ActionButtonActivity, MenuProvide
         )
         setClickableText(binding.accountNoteTextView, emojifiedNote, emptyList(), null, this)
 
-        accountFieldAdapter.fields = account.fields.orEmpty()
-        accountFieldAdapter.emojis = account.emojis.orEmpty()
+        accountFieldAdapter.fields = account.fields
+        accountFieldAdapter.emojis = account.emojis
         accountFieldAdapter.notifyDataSetChanged()
 
         binding.accountLockedImageView.visible(account.locked)
@@ -660,7 +660,7 @@ class AccountActivity : BottomSheetActivity(), ActionButtonActivity, MenuProvide
      */
     private fun updateRemoteAccount() {
         loadedAccount?.let { account ->
-            if (account.isRemote()) {
+            if (account.isRemote) {
                 binding.accountRemoveView.show()
                 binding.accountRemoveView.setOnClickListener {
                     openLink(account.url)
@@ -1088,7 +1088,7 @@ class AccountActivity : BottomSheetActivity(), ActionButtonActivity, MenuProvide
     }
 
     private fun getFullUsername(account: Account): String {
-        return if (account.isRemote()) {
+        return if (account.isRemote) {
             "@" + account.username
         } else {
             val localUsername = account.localUsername

app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeViewModel.kt

@@ -369,7 +369,7 @@ class ComposeViewModel @Inject constructor(
         val tootToSend = StatusToSend(
             text = content,
             warningText = spoilerText,
-            visibility = statusVisibility.value.serverString(),
+            visibility = statusVisibility.value.serverString,
             sensitive = attachedMedia.isNotEmpty() && (markMediaAsSensitive.value || showContentWarning.value),
             media = attachedMedia,
             scheduledAt = scheduledAt.value,

app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationEntity.kt

@@ -27,6 +27,7 @@ import com.keylesspalace.tusky.entity.Poll
 import com.keylesspalace.tusky.entity.Status
 import com.keylesspalace.tusky.entity.TimelineAccount
 import com.keylesspalace.tusky.viewdata.StatusViewData
+import com.squareup.moshi.JsonClass
 import java.util.Date
 
 @Entity(primaryKeys = ["id", "accountId"])
@@ -50,6 +51,7 @@ data class ConversationEntity(
     }
 }
 
+@JsonClass(generateAdapter = true)
 data class ConversationAccountEntity(
     val id: String,
     val localUsername: String,
@@ -131,7 +133,7 @@ data class ConversationStatusEntity(
                 poll = poll,
                 card = null,
                 language = language,
-                filtered = null
+                filtered = emptyList()
             ),
             isExpanded = expanded,
             isShowingContent = showingHiddenContent,

app/src/main/java/com/keylesspalace/tusky/components/drafts/DraftHelper.kt

@@ -101,16 +101,17 @@ class DraftHelper @Inject constructor(
             }
         }
 
-        val attachments: MutableList<DraftAttachment> = mutableListOf()
-        for (i in mediaUris.indices) {
-            attachments.add(
-                DraftAttachment(
-                    uriString = uris[i].toString(),
-                    description = mediaDescriptions[i],
-                    focus = mediaFocus[i],
-                    type = types[i]
+        val attachments: List<DraftAttachment> = buildList {
+            for (i in mediaUris.indices) {
+                add(
+                    DraftAttachment(
+                        uriString = uris[i].toString(),
+                        description = mediaDescriptions[i],
+                        focus = mediaFocus[i],
+                        type = types[i]
+                    )
                 )
-            )
+            }
         }
 
         val draft = DraftEntity(

app/src/main/java/com/keylesspalace/tusky/components/login/LoginWebViewViewModel.kt

@@ -39,7 +39,7 @@ class LoginWebViewViewModel @Inject constructor(
             viewModelScope.launch {
                 api.getInstance().fold(
                     { instance ->
-                        instanceRules.value = instance.rules.orEmpty().map { rule -> rule.text }
+                        instanceRules.value = instance.rules.map { rule -> rule.text }
                     },
                     { throwable ->
                         if (throwable.isHttpNotFound()) {

app/src/main/java/com/keylesspalace/tusky/components/preference/AccountPreferencesFragment.kt

@@ -180,7 +180,7 @@ class AccountPreferencesFragment : PreferenceFragmentCompat(), Injectable {
                     key = PrefKeys.DEFAULT_POST_PRIVACY
                     setSummaryProvider { entry }
                     val visibility = accountManager.activeAccount?.defaultPostPrivacy ?: Status.Visibility.PUBLIC
-                    value = visibility.serverString()
+                    value = visibility.serverString
                     setIcon(getIconForVisibility(visibility))
                     setOnPreferenceChangeListener { _, newValue ->
                         setIcon(

app/src/main/java/com/keylesspalace/tusky/components/search/fragments/SearchStatusesFragment.kt

@@ -262,7 +262,7 @@ class SearchStatusesFragment : SearchFragment<StatusViewData.Concrete>(), Status
                 Status.Visibility.PUBLIC, Status.Visibility.UNLISTED -> {
                     val textId =
                         getString(
-                            if (status.isPinned()) R.string.unpin_action else R.string.pin_action
+                            if (status.pinned) R.string.unpin_action else R.string.pin_action
                         )
                     menu.add(0, R.id.pin, 1, textId)
                 }
@@ -391,7 +391,7 @@ class SearchStatusesFragment : SearchFragment<StatusViewData.Concrete>(), Status
                     return@setOnMenuItemClickListener true
                 }
                 R.id.pin -> {
-                    viewModel.pinAccount(status, !status.isPinned())
+                    viewModel.pinAccount(status, !status.pinned)
                     return@setOnMenuItemClickListener true
                 }
             }
@@ -498,7 +498,7 @@ class SearchStatusesFragment : SearchFragment<StatusViewData.Concrete>(), Status
                             { deletedStatus ->
                                 removeItem(position)
 
-                                val redraftStatus = if (deletedStatus.isEmpty()) {
+                                val redraftStatus = if (deletedStatus.isEmpty) {
                                     status.toDeletedStatus()
                                 } else {
                                     deletedStatus