karol/quik
0
0
Fork 0
forked from upstream-mirrors/quik
Code Pull Requests Actions Releases 10 Activity

#1297 - Respect subject charset when decoding subject

Browse Source
This commit is contained in:
Moez Bhatti
2018-09-08 02:19:16 -04:00
parent e3d6b4276f
commit 8ba008ef48
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/src/main/java/com/moez/QKSMS/mapper/CursorToMessageImpl.kt
+7 -1
View File
@@ -22,7 +22,9 @@ import android.content.Context
import android.database.Cursor
import android.net.Uri
import android.provider.Telephony.*
import com.google.android.mms.pdu_alt.EncodedStringValue
import com.google.android.mms.pdu_alt.PduHeaders
import com.google.android.mms.pdu_alt.PduPersister
import com.moez.QKSMS.extensions.map
import com.moez.QKSMS.manager.KeyManager
import com.moez.QKSMS.manager.PermissionManager
@@ -114,7 +116,11 @@ class CursorToMessageImpl @Inject constructor(
readReportString = cursor.getString(columnsMap.mmsReadReport) ?: ""
messageType = cursor.getInt(columnsMap.mmsMessageType)
mmsStatus = cursor.getInt(columnsMap.mmsStatus)
subject = cursor.getString(columnsMap.mmsSubject) ?: ""
val subjectCharset = cursor.getInt(columnsMap.mmsSubjectCharset)
subject = cursor.getString(columnsMap.mmsSubject)
?.takeIf { it.isNotBlank() }
?.let(PduPersister::getBytes)
?.let { EncodedStringValue(subjectCharset, it).string } ?: ""
textContentType = ""
attachmentType = Message.AttachmentType.NOT_LOADED