forked from upstream-mirrors/quik
#1297 - Respect subject charset when decoding subject
This commit is contained in:
@@ -22,7 +22,9 @@ import android.content.Context
|
|||||||
import android.database.Cursor
|
import android.database.Cursor
|
||||||
import android.net.Uri
|
import android.net.Uri
|
||||||
import android.provider.Telephony.*
|
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.PduHeaders
|
||||||
|
import com.google.android.mms.pdu_alt.PduPersister
|
||||||
import com.moez.QKSMS.extensions.map
|
import com.moez.QKSMS.extensions.map
|
||||||
import com.moez.QKSMS.manager.KeyManager
|
import com.moez.QKSMS.manager.KeyManager
|
||||||
import com.moez.QKSMS.manager.PermissionManager
|
import com.moez.QKSMS.manager.PermissionManager
|
||||||
@@ -114,7 +116,11 @@ class CursorToMessageImpl @Inject constructor(
|
|||||||
readReportString = cursor.getString(columnsMap.mmsReadReport) ?: ""
|
readReportString = cursor.getString(columnsMap.mmsReadReport) ?: ""
|
||||||
messageType = cursor.getInt(columnsMap.mmsMessageType)
|
messageType = cursor.getInt(columnsMap.mmsMessageType)
|
||||||
mmsStatus = cursor.getInt(columnsMap.mmsStatus)
|
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 = ""
|
textContentType = ""
|
||||||
attachmentType = Message.AttachmentType.NOT_LOADED
|
attachmentType = Message.AttachmentType.NOT_LOADED
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user