From 12884a8f5ec823bab87a5bd9fcb255a3d8b47e3e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 3 Jun 2025 09:35:54 +0000
Subject: [PATCH 1/2] chore(deps): bump com.google.devtools.ksp

Bumps [com.google.devtools.ksp](https://github.com/google/ksp) from 1.9.25-1.0.20 to 2.1.21-2.0.1.
- [Release notes](https://github.com/google/ksp/releases)
- [Commits](https://github.com/google/ksp/compare/1.9.25-1.0.20...2.1.21-2.0.1)

---
updated-dependencies:
- dependency-name: com.google.devtools.ksp
  dependency-version: 2.1.21-2.0.1
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 5ae36c339..a6d389de7 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -3,7 +3,7 @@
 kotlin = "2.1.21"
 kotlinxSerializationJson = "1.8.1"
 #KSP
-ksp = "1.9.25-1.0.20"
+ksp = "2.1.21-2.0.1"
 #Detekt
 detekt = "1.23.8"
 #AndroidX

From 0260629b0779fde8fdf8aa454bb30df74213c164 Mon Sep 17 00:00:00 2001
From: Naveen Singh <36371707+naveensingh@users.noreply.github.com>
Date: Tue, 3 Jun 2025 15:16:33 +0530
Subject: [PATCH 2/2] fix: make value nullable

---
 .../org/fossify/messages/helpers/Converters.kt   | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/src/main/kotlin/org/fossify/messages/helpers/Converters.kt b/app/src/main/kotlin/org/fossify/messages/helpers/Converters.kt
index fd729a07a..fd7bf7626 100644
--- a/app/src/main/kotlin/org/fossify/messages/helpers/Converters.kt
+++ b/app/src/main/kotlin/org/fossify/messages/helpers/Converters.kt
@@ -14,20 +14,28 @@ class Converters {
     private val messageAttachmentType = object : TypeToken<MessageAttachment?>() {}.type
 
     @TypeConverter
-    fun jsonToAttachmentList(value: String) = gson.fromJson<ArrayList<Attachment>>(value, attachmentType)
+    fun jsonToAttachmentList(value: String?): ArrayList<Attachment>? {
+        return gson.fromJson<ArrayList<Attachment>>(value, attachmentType)
+    }
 
     @TypeConverter
     fun attachmentListToJson(list: ArrayList<Attachment>) = gson.toJson(list)
 
     @TypeConverter
-    fun jsonToSimpleContactList(value: String) = gson.fromJson<ArrayList<SimpleContact>>(value, simpleContactType)
+    fun jsonToSimpleContactList(value: String?): ArrayList<SimpleContact>? {
+        return gson.fromJson<ArrayList<SimpleContact>>(value, simpleContactType)
+    }
 
     @TypeConverter
     fun simpleContactListToJson(list: ArrayList<SimpleContact>) = gson.toJson(list)
 
     @TypeConverter
-    fun jsonToMessageAttachment(value: String) = gson.fromJson<MessageAttachment>(value, messageAttachmentType)
+    fun jsonToMessageAttachment(value: String): MessageAttachment? {
+        return gson.fromJson<MessageAttachment>(value, messageAttachmentType)
+    }
 
     @TypeConverter
-    fun messageAttachmentToJson(messageAttachment: MessageAttachment?) = gson.toJson(messageAttachment)
+    fun messageAttachmentToJson(messageAttachment: MessageAttachment?): String? {
+        return gson.toJson(messageAttachment)
+    }
 }