diff options
| author | Taesu Lee <taesu82.lee@samsung.com> | 2019-03-21 13:23:40 +0900 |
|---|---|---|
| committer | Michael Bestas <mkbestas@lineageos.org> | 2019-09-15 01:37:54 +0300 |
| commit | 33cd868928d6274b7aea03a21f894048ef49bf33 (patch) | |
| tree | e1f72936e1c45307a019d0dd0687868a7b4044f3 /src | |
| parent | a19b3f35f1b127e3b1ecbaeec8a68cf56555e2c2 (diff) | |
| download | packages_apps_Messaging-33cd868928d6274b7aea03a21f894048ef49bf33.tar.gz packages_apps_Messaging-33cd868928d6274b7aea03a21f894048ef49bf33.tar.bz2 packages_apps_Messaging-33cd868928d6274b7aea03a21f894048ef49bf33.zip | |
Use correct format info for SMS
Use correct format to
- Parse SMS delivery report.
- Dump/Load SMS to/from the dump file.
TODO: Update message text state during composing.
Test: Manual
Change-Id: I7e53bed86130484a634c9305b276e2586db31796
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/messaging/receiver/SmsReceiver.java | 2 | ||||
| -rw-r--r-- | src/com/android/messaging/sms/MmsUtils.java | 3 | ||||
| -rw-r--r-- | src/com/android/messaging/util/DebugUtils.java | 9 |
3 files changed, 10 insertions, 4 deletions
diff --git a/src/com/android/messaging/receiver/SmsReceiver.java b/src/com/android/messaging/receiver/SmsReceiver.java index 859beff..b54359f 100644 --- a/src/com/android/messaging/receiver/SmsReceiver.java +++ b/src/com/android/messaging/receiver/SmsReceiver.java @@ -192,7 +192,7 @@ public final class SmsReceiver extends BroadcastReceiver { intent, EXTRA_SUB_ID); deliverSmsMessages(context, subId, errorCode, messages); if (MmsUtils.isDumpSmsEnabled()) { - final String format = null; + final String format = intent.getStringExtra("format"); DebugUtils.dumpSms(messages[0].getTimestampMillis(), messages, format); } } diff --git a/src/com/android/messaging/sms/MmsUtils.java b/src/com/android/messaging/sms/MmsUtils.java index 2de6678..91631b3 100644 --- a/src/com/android/messaging/sms/MmsUtils.java +++ b/src/com/android/messaging/sms/MmsUtils.java @@ -1194,7 +1194,8 @@ public class MmsUtils { public static SmsMessage getSmsMessageFromDeliveryReport(final Intent intent) { final byte[] pdu = intent.getByteArrayExtra("pdu"); - return SmsMessage.createFromPdu(pdu); + final String format = intent.getStringExtra("format"); + return SmsMessage.createFromPdu(pdu, format); } /** diff --git a/src/com/android/messaging/util/DebugUtils.java b/src/com/android/messaging/util/DebugUtils.java index 1362f83..0d689fe 100644 --- a/src/com/android/messaging/util/DebugUtils.java +++ b/src/com/android/messaging/util/DebugUtils.java @@ -291,9 +291,10 @@ public class DebugUtils { dis = new DataInputStream(fis); // SMS dump + String format = null; final int chars = dis.readInt(); if (chars > 0) { - final String format = dis.readUTF(); + format = dis.readUTF(); } final int count = dis.readInt(); final SmsMessage[] messagesTemp = new SmsMessage[count]; @@ -301,7 +302,11 @@ public class DebugUtils { final int length = dis.readInt(); final byte[] pdu = new byte[length]; dis.read(pdu, 0, length); - messagesTemp[i] = SmsMessage.createFromPdu(pdu); + if (format == null) { + messagesTemp[i] = SmsMessage.createFromPdu(pdu); + } else { + messagesTemp[i] = SmsMessage.createFromPdu(pdu, format); + } } messages = messagesTemp; } catch (final FileNotFoundException e) { |