Fixed message sizes. Allowed sending pictures without description.

Revertron · Jan 25, 2023 · 7baf16a · 7baf16a
1 parent aced92d
commit 7baf16a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/apps/Android/app/build.gradle b/apps/Android/app/build.gradle
@@ -12,7 +12,7 @@ android {
         minSdk 21
         targetSdk 31
         versionCode 16
-        versionName "1.9.0"
+        versionName "1.9.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

diff --git a/apps/Android/app/src/main/java/com/revertron/mimir/ChatActivity.kt b/apps/Android/app/src/main/java/com/revertron/mimir/ChatActivity.kt
@@ -76,7 +76,7 @@ class ChatActivity : BaseActivity(), Toolbar.OnMenuItemClickListener, StorageLis
         val sendButton = findViewById<AppCompatImageButton>(R.id.send_button)
         sendButton.setOnClickListener {
             val text: String = editText.text.toString().trim()
-            if (text.isNotEmpty()) {
+            if (text.isNotEmpty() || attachmentJson != null) {
                 editText.text?.clear()
                 sendMessage(contact.pubkey, text, replyTo)
                 replyPanel.visibility = View.GONE

diff --git a/apps/Android/app/src/main/java/com/revertron/mimir/net/Messages.kt b/apps/Android/app/src/main/java/com/revertron/mimir/net/Messages.kt
@@ -60,6 +60,9 @@ fun readClientHello(dis: DataInputStream, read_address: Boolean): ClientHello? {
         count += read
     }
     size = dis.readInt()
+    if (size != 32) {
+        return null
+    }
     val receiver = ByteArray(size)
     count = 0
     while (count < size) {
@@ -72,6 +75,9 @@ fun readClientHello(dis: DataInputStream, read_address: Boolean): ClientHello? {
     val clientId = dis.readInt()
     val address = if (read_address) {
         val size = dis.readInt()
+        if (size != 16) {
+            return null
+        }
         val buf = ByteArray(size)
         dis.read(buf)
         InetAddress.getByAddress(buf)
@@ -213,6 +219,7 @@ fun writeMessage(dos: DataOutputStream, message: Message, filePath: String, stre
     val data: ByteArray
     var jsonSize = -1
     if (message.data.isNotEmpty()) {
+        var add = 0
         when (message.type) {
             1 -> {
                 val meta = JSONObject(String(message.data))
@@ -221,12 +228,13 @@ fun writeMessage(dos: DataOutputStream, message: Message, filePath: String, stre
                 val picture = getFileContents(file.absolutePath)
                 //TODO optimize memory
                 data = message.data.plus(picture)
+                add = 4
             }
             else -> {
                 data = message.data
             }
         }
-        json.put("payloadSize", data.size + 4)
+        json.put("payloadSize", data.size + add)
     } else {
         data = message.data
     }