Handle special characters in file names

This commit is contained in:
Matéo Duparc 2021-07-25 14:26:59 +02:00
parent f186dbd0cb
commit 37e4c0a105
Signed by: hardcoresushi
GPG Key ID: 007F84120107191E
2 changed files with 5 additions and 5 deletions

View File

@ -400,7 +400,6 @@ class AIRAService : Service() {
) )
.build() .build()
) )
} }
notificationManager.notify(notificationIdManager.getMessageNotificationId(sessionId), notificationBuilder.build()) notificationManager.notify(notificationIdManager.getMessageNotificationId(sessionId), notificationBuilder.build())
} }

View File

@ -1,6 +1,5 @@
package sushi.hardcore.aira.background_service package sushi.hardcore.aira.background_service
import sushi.hardcore.aira.widgets.Avatar
import java.nio.ByteBuffer import java.nio.ByteBuffer
class Protocol { class Protocol {
@ -38,15 +37,17 @@ class Protocol {
} }
fun newFile(fileName: String, buffer: ByteArray): ByteArray { fun newFile(fileName: String, buffer: ByteArray): ByteArray {
return byteArrayOf(FILE)+ByteBuffer.allocate(2).putShort(fileName.length.toShort()).array()+fileName.toByteArray()+buffer val fileNameBytes = fileName.toByteArray()
return byteArrayOf(FILE)+ByteBuffer.allocate(2).putShort(fileNameBytes.size.toShort()).array()+fileNameBytes+buffer
} }
fun askLargeFiles(files: List<SendFile>): ByteArray { fun askLargeFiles(files: List<SendFile>): ByteArray {
var buff = byteArrayOf(ASK_LARGE_FILES) var buff = byteArrayOf(ASK_LARGE_FILES)
for (file in files) { for (file in files) {
val fileName = file.fileName.toByteArray()
buff += ByteBuffer.allocate(8).putLong(file.fileSize).array() buff += ByteBuffer.allocate(8).putLong(file.fileSize).array()
buff += ByteBuffer.allocate(2).putShort(file.fileName.length.toShort()).array() buff += ByteBuffer.allocate(2).putShort(fileName.size.toShort()).array()
buff += file.fileName.toByteArray() buff += fileName
} }
return buff return buff
} }