From df8e98aa25872c210ab55dcfdd79da3a218d469e Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sat, 13 Jan 2018 23:36:16 -0500 Subject: [PATCH] Replace some hardcoded ints with PduHeader constants --- .../java/com/klinker/android/send_message/Transaction.java | 4 ++-- qksms/src/main/java/data/mapper/CursorToMessage.kt | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/android-smsmms/src/main/java/com/klinker/android/send_message/Transaction.java b/android-smsmms/src/main/java/com/klinker/android/send_message/Transaction.java index 930cf784..e6f17b36 100755 --- a/android-smsmms/src/main/java/com/klinker/android/send_message/Transaction.java +++ b/android-smsmms/src/main/java/com/klinker/android/send_message/Transaction.java @@ -731,7 +731,7 @@ public class Transaction { mmsValues.put("exp", imageBytes); mmsValues.put("m_cls", "personal"); - mmsValues.put("m_type", 128); // 132 (RETRIEVE CONF) 130 (NOTIF IND) 128 (SEND REQ) + mmsValues.put("m_type", PduHeaders.MESSAGE_TYPE_SEND_REQ); // 132 (RETRIEVE CONF) 130 (NOTIF IND) 128 (SEND REQ) mmsValues.put("v", 19); mmsValues.put("pri", 129); mmsValues.put("tr_id", "T" + Long.toHexString(now)); @@ -813,7 +813,7 @@ public class Transaction { ContentValues addrValues = new ContentValues(); addrValues.put("address", addr); addrValues.put("charset", "106"); - addrValues.put("type", 151); // TO + addrValues.put("type", PduHeaders.TO); Uri addrUri = Uri.parse("content://mms/" + id + "/addr"); return context.getContentResolver().insert(addrUri, addrValues); } diff --git a/qksms/src/main/java/data/mapper/CursorToMessage.kt b/qksms/src/main/java/data/mapper/CursorToMessage.kt index a0d1f805..296c2f0f 100644 --- a/qksms/src/main/java/data/mapper/CursorToMessage.kt +++ b/qksms/src/main/java/data/mapper/CursorToMessage.kt @@ -22,6 +22,7 @@ import android.content.Context import android.database.Cursor import android.net.Uri import android.provider.Telephony.* +import com.google.android.mms.pdu_alt.PduHeaders import common.util.Keys import data.model.Message import timber.log.Timber @@ -95,7 +96,7 @@ class CursorToMessage @Inject constructor( //TODO: Use Charset to ensure address is decoded correctly val projection = arrayOf(Mms.Addr.ADDRESS, Mms.Addr.CHARSET) - val selection = "${Mms.Addr.TYPE} = 137" + val selection = "${Mms.Addr.TYPE} = ${PduHeaders.FROM}" val cursor = context.contentResolver.query(uri, projection, selection, null, null) cursor?.use {