Merge pull request #114 from xmtp/np/add-filename-to-decrypted-attach…

…ment

fix: add file name to decrypted local attachment

android/build.gradle

@@ -95,7 +95,7 @@ repositories {
 dependencies {
   implementation project(':expo-modules-core')
   implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${getKotlinVersion()}"
-  implementation "org.xmtp:android:0.5.6"
+  implementation "org.xmtp:android:0.6.0"
   implementation 'com.google.code.gson:gson:2.10.1'
   implementation 'com.facebook.react:react-native:0.71.3'
   implementation "com.daveanthonythomas.moshipack:moshipack:1.0.1"

android/src/main/java/expo/modules/xmtpreactnativesdk/XMTPModule.kt

@@ -262,6 +262,7 @@ class XMTPModule : Module() {
             DecryptedLocalAttachment(
                 fileUri = file.toURI().toString(),
                 mimeType = attachment.mimeType,
+                filename = attachment.filename
             ).toJson()
         }
 

android/src/main/java/expo/modules/xmtpreactnativesdk/wrappers/DecryptedLocalAttachment.kt

@@ -10,11 +10,13 @@ import com.google.gson.JsonParser
 class DecryptedLocalAttachment(
     val fileUri: String,
     val mimeType: String,
+    val filename: String,
 ) {
     companion object {
         fun fromJsonObject(obj: JsonObject) = DecryptedLocalAttachment(
             obj.get("fileUri").asString,
             obj.get("mimeType").asString,
+            obj.get("filename")?.asString ?: "",
         )
 
         fun fromJson(json: String): DecryptedLocalAttachment {
@@ -26,6 +28,7 @@ class DecryptedLocalAttachment(
     fun toJsonMap(): Map<String, Any> = mapOf(
         "fileUri" to fileUri,
         "mimeType" to mimeType,
+        "filename" to filename,
     )
 
     fun toJson(): String = GsonBuilder().create().toJson(toJsonMap())

example/src/tests.ts

@@ -438,6 +438,9 @@ test("remote attachments should work", async () => {
   if (attached.mimeType !== "text/plain") {
     throw new Error("Expected mimeType to match");
   }
+  if (attached.filename !== filename) {
+    throw new Error(`Expected ${attached.filename} to equal ${filename}`);
+  }
   const text = await fs.readFile(new URL(attached.fileUri).pathname, "utf8");
   if (text !== "hello world") {
     throw new Error("Expected text to match");

ios/Wrappers/DecodedMessageWrapper.swift

@@ -251,20 +251,23 @@ struct EncryptedLocalAttachment {
 struct DecryptedLocalAttachment {
   var fileUri: String
   var mimeType: String
+  var filename: String
 
   static func fromJson(_ json: String) throws -> DecryptedLocalAttachment {
     let data = json.data(using: .utf8)!
     let obj = (try? JSONSerialization.jsonObject(with: data) as? [String: Any]) ?? [:]
     return DecryptedLocalAttachment(
       fileUri: obj["fileUri"] as? String ?? "",
-      mimeType: obj["mimeType"] as? String ?? ""
+      mimeType: obj["mimeType"] as? String ?? "",
+      filename: obj["filename"] as? String ?? ""
     )
   }
 
   func toJson() throws -> String {
     let obj: [String: Any] = [
       "fileUri": fileUri,
-      "mimeType": mimeType
+      "mimeType": mimeType,
+      "filename": filename
     ]
     return try obj.toJson()
   }

ios/XMTPModule.swift

@@ -223,7 +223,8 @@ public class XMTPModule: Module {
             try attachment.data.write(to: file)
             return try DecryptedLocalAttachment(
                     fileUri: file.absoluteString,
-                    mimeType: attachment.mimeType
+                    mimeType: attachment.mimeType,
+                    filename: attachment.filename
             ).toJson()
         }
 

src/XMTP.types.ts

@@ -23,6 +23,7 @@ export type StaticAttachmentContent = {
 export type DecryptedLocalAttachment = {
   fileUri: string;
   mimeType?: string;
+  filename?: string;
 };
 
 export type RemoteAttachmentMetadata = {