From 5497dad6958412ad2cc69ec7d6a34692ad9c07a0 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Tue, 9 Jan 2018 17:08:20 -0500 Subject: [PATCH] Refactor google mms packages, correct expected incoming MMS action --- .../mms/{pdu => pdu_alt}/AcknowledgeInd.java | 2 +- .../android/mms/{pdu => pdu_alt}/Base64.java | 2 +- .../mms/{pdu => pdu_alt}/CharacterSets.java | 2 +- .../android/mms/{pdu => pdu_alt}/DeliveryInd.java | 2 +- .../mms/{pdu => pdu_alt}/EncodedStringValue.java | 2 +- .../android/mms/{pdu => pdu_alt}/GenericPdu.java | 2 +- .../mms/{pdu => pdu_alt}/MultimediaMessagePdu.java | 2 +- .../mms/{pdu => pdu_alt}/NotificationInd.java | 2 +- .../mms/{pdu => pdu_alt}/NotifyRespInd.java | 2 +- .../android/mms/{pdu => pdu_alt}/PduBody.java | 2 +- .../mms/{pdu => pdu_alt}/PduContentTypes.java | 2 +- .../android/mms/{pdu => pdu_alt}/PduHeaders.java | 2 +- .../android/mms/{pdu => pdu_alt}/PduParser.java | 2 +- .../android/mms/{pdu => pdu_alt}/PduPart.java | 2 +- .../android/mms/{pdu => pdu_alt}/PduPersister.java | 14 +++++++------- .../mms/{pdu => pdu_alt}/QuotedPrintable.java | 2 +- .../android/mms/{pdu => pdu_alt}/ReadOrigInd.java | 2 +- .../android/mms/{pdu => pdu_alt}/ReadRecInd.java | 2 +- .../android/mms/{pdu => pdu_alt}/RetrieveConf.java | 2 +- .../android/mms/{pdu => pdu_alt}/SendConf.java | 2 +- .../android/mms/{pdu => pdu_alt}/SendReq.java | 2 +- .../mms/{util => util_alt}/AbstractCache.java | 2 +- .../mms/{util => util_alt}/DownloadDrmHelper.java | 2 +- .../mms/{util => util_alt}/DrmConvertSession.java | 2 +- .../android/mms/{util => util_alt}/PduCache.java | 2 +- .../mms/{util => util_alt}/PduCacheEntry.java | 4 ++-- .../mms/{util => util_alt}/SqliteWrapper.java | 2 +- .../main/java/presentation/receiver/MmsReceiver.kt | 14 +++++++++----- 28 files changed, 43 insertions(+), 39 deletions(-) rename google-mms/src/main/java/com/google/android/mms/{pdu => pdu_alt}/AcknowledgeInd.java (98%) rename google-mms/src/main/java/com/google/android/mms/{pdu => pdu_alt}/Base64.java (99%) rename google-mms/src/main/java/com/google/android/mms/{pdu => pdu_alt}/CharacterSets.java (99%) rename google-mms/src/main/java/com/google/android/mms/{pdu => pdu_alt}/DeliveryInd.java (98%) rename google-mms/src/main/java/com/google/android/mms/{pdu => pdu_alt}/EncodedStringValue.java (99%) rename google-mms/src/main/java/com/google/android/mms/{pdu => pdu_alt}/GenericPdu.java (98%) rename google-mms/src/main/java/com/google/android/mms/{pdu => pdu_alt}/MultimediaMessagePdu.java (98%) rename google-mms/src/main/java/com/google/android/mms/{pdu => pdu_alt}/NotificationInd.java (99%) rename google-mms/src/main/java/com/google/android/mms/{pdu => pdu_alt}/NotifyRespInd.java (98%) rename google-mms/src/main/java/com/google/android/mms/{pdu => pdu_alt}/PduBody.java (99%) rename google-mms/src/main/java/com/google/android/mms/{pdu => pdu_alt}/PduContentTypes.java (99%) rename google-mms/src/main/java/com/google/android/mms/{pdu => pdu_alt}/PduHeaders.java (99%) rename google-mms/src/main/java/com/google/android/mms/{pdu => pdu_alt}/PduParser.java (99%) rename google-mms/src/main/java/com/google/android/mms/{pdu => pdu_alt}/PduPart.java (99%) rename google-mms/src/main/java/com/google/android/mms/{pdu => pdu_alt}/PduPersister.java (99%) rename google-mms/src/main/java/com/google/android/mms/{pdu => pdu_alt}/QuotedPrintable.java (98%) rename google-mms/src/main/java/com/google/android/mms/{pdu => pdu_alt}/ReadOrigInd.java (99%) rename google-mms/src/main/java/com/google/android/mms/{pdu => pdu_alt}/ReadRecInd.java (99%) rename google-mms/src/main/java/com/google/android/mms/{pdu => pdu_alt}/RetrieveConf.java (99%) rename google-mms/src/main/java/com/google/android/mms/{pdu => pdu_alt}/SendConf.java (98%) rename google-mms/src/main/java/com/google/android/mms/{pdu => pdu_alt}/SendReq.java (99%) rename google-mms/src/main/java/com/google/android/mms/{util => util_alt}/AbstractCache.java (98%) rename google-mms/src/main/java/com/google/android/mms/{util => util_alt}/DownloadDrmHelper.java (99%) rename google-mms/src/main/java/com/google/android/mms/{util => util_alt}/DrmConvertSession.java (99%) rename google-mms/src/main/java/com/google/android/mms/{util => util_alt}/PduCache.java (99%) rename google-mms/src/main/java/com/google/android/mms/{util => util_alt}/PduCacheEntry.java (92%) rename google-mms/src/main/java/com/google/android/mms/{util => util_alt}/SqliteWrapper.java (99%) diff --git a/google-mms/src/main/java/com/google/android/mms/pdu/AcknowledgeInd.java b/google-mms/src/main/java/com/google/android/mms/pdu_alt/AcknowledgeInd.java similarity index 98% rename from google-mms/src/main/java/com/google/android/mms/pdu/AcknowledgeInd.java rename to google-mms/src/main/java/com/google/android/mms/pdu_alt/AcknowledgeInd.java index 09002ca8..c7f76377 100644 --- a/google-mms/src/main/java/com/google/android/mms/pdu/AcknowledgeInd.java +++ b/google-mms/src/main/java/com/google/android/mms/pdu_alt/AcknowledgeInd.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.mms.pdu; +package com.google.android.mms.pdu_alt; import com.google.android.mms.InvalidHeaderValueException; diff --git a/google-mms/src/main/java/com/google/android/mms/pdu/Base64.java b/google-mms/src/main/java/com/google/android/mms/pdu_alt/Base64.java similarity index 99% rename from google-mms/src/main/java/com/google/android/mms/pdu/Base64.java rename to google-mms/src/main/java/com/google/android/mms/pdu_alt/Base64.java index f0fa1b9f..739879f7 100644 --- a/google-mms/src/main/java/com/google/android/mms/pdu/Base64.java +++ b/google-mms/src/main/java/com/google/android/mms/pdu_alt/Base64.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.mms.pdu; +package com.google.android.mms.pdu_alt; public class Base64 { /** diff --git a/google-mms/src/main/java/com/google/android/mms/pdu/CharacterSets.java b/google-mms/src/main/java/com/google/android/mms/pdu_alt/CharacterSets.java similarity index 99% rename from google-mms/src/main/java/com/google/android/mms/pdu/CharacterSets.java rename to google-mms/src/main/java/com/google/android/mms/pdu_alt/CharacterSets.java index f4e29eeb..a2f93c5d 100644 --- a/google-mms/src/main/java/com/google/android/mms/pdu/CharacterSets.java +++ b/google-mms/src/main/java/com/google/android/mms/pdu_alt/CharacterSets.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.mms.pdu; +package com.google.android.mms.pdu_alt; import java.io.UnsupportedEncodingException; import java.util.HashMap; diff --git a/google-mms/src/main/java/com/google/android/mms/pdu/DeliveryInd.java b/google-mms/src/main/java/com/google/android/mms/pdu_alt/DeliveryInd.java similarity index 98% rename from google-mms/src/main/java/com/google/android/mms/pdu/DeliveryInd.java rename to google-mms/src/main/java/com/google/android/mms/pdu_alt/DeliveryInd.java index f1481ce5..7609965d 100644 --- a/google-mms/src/main/java/com/google/android/mms/pdu/DeliveryInd.java +++ b/google-mms/src/main/java/com/google/android/mms/pdu_alt/DeliveryInd.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.mms.pdu; +package com.google.android.mms.pdu_alt; import com.google.android.mms.InvalidHeaderValueException; diff --git a/google-mms/src/main/java/com/google/android/mms/pdu/EncodedStringValue.java b/google-mms/src/main/java/com/google/android/mms/pdu_alt/EncodedStringValue.java similarity index 99% rename from google-mms/src/main/java/com/google/android/mms/pdu/EncodedStringValue.java rename to google-mms/src/main/java/com/google/android/mms/pdu_alt/EncodedStringValue.java index d70b1e8f..17076f9e 100644 --- a/google-mms/src/main/java/com/google/android/mms/pdu/EncodedStringValue.java +++ b/google-mms/src/main/java/com/google/android/mms/pdu_alt/EncodedStringValue.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.mms.pdu; +package com.google.android.mms.pdu_alt; import android.util.Log; diff --git a/google-mms/src/main/java/com/google/android/mms/pdu/GenericPdu.java b/google-mms/src/main/java/com/google/android/mms/pdu_alt/GenericPdu.java similarity index 98% rename from google-mms/src/main/java/com/google/android/mms/pdu/GenericPdu.java rename to google-mms/src/main/java/com/google/android/mms/pdu_alt/GenericPdu.java index 361e2614..f75a9077 100644 --- a/google-mms/src/main/java/com/google/android/mms/pdu/GenericPdu.java +++ b/google-mms/src/main/java/com/google/android/mms/pdu_alt/GenericPdu.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.mms.pdu; +package com.google.android.mms.pdu_alt; import com.google.android.mms.InvalidHeaderValueException; diff --git a/google-mms/src/main/java/com/google/android/mms/pdu/MultimediaMessagePdu.java b/google-mms/src/main/java/com/google/android/mms/pdu_alt/MultimediaMessagePdu.java similarity index 98% rename from google-mms/src/main/java/com/google/android/mms/pdu/MultimediaMessagePdu.java rename to google-mms/src/main/java/com/google/android/mms/pdu_alt/MultimediaMessagePdu.java index db2d17f8..7433f388 100644 --- a/google-mms/src/main/java/com/google/android/mms/pdu/MultimediaMessagePdu.java +++ b/google-mms/src/main/java/com/google/android/mms/pdu_alt/MultimediaMessagePdu.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.mms.pdu; +package com.google.android.mms.pdu_alt; import com.google.android.mms.InvalidHeaderValueException; diff --git a/google-mms/src/main/java/com/google/android/mms/pdu/NotificationInd.java b/google-mms/src/main/java/com/google/android/mms/pdu_alt/NotificationInd.java similarity index 99% rename from google-mms/src/main/java/com/google/android/mms/pdu/NotificationInd.java rename to google-mms/src/main/java/com/google/android/mms/pdu_alt/NotificationInd.java index 1901da56..0e0f5543 100644 --- a/google-mms/src/main/java/com/google/android/mms/pdu/NotificationInd.java +++ b/google-mms/src/main/java/com/google/android/mms/pdu_alt/NotificationInd.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.mms.pdu; +package com.google.android.mms.pdu_alt; import com.google.android.mms.InvalidHeaderValueException; diff --git a/google-mms/src/main/java/com/google/android/mms/pdu/NotifyRespInd.java b/google-mms/src/main/java/com/google/android/mms/pdu_alt/NotifyRespInd.java similarity index 98% rename from google-mms/src/main/java/com/google/android/mms/pdu/NotifyRespInd.java rename to google-mms/src/main/java/com/google/android/mms/pdu_alt/NotifyRespInd.java index 3edf6edb..d6ba6dc3 100644 --- a/google-mms/src/main/java/com/google/android/mms/pdu/NotifyRespInd.java +++ b/google-mms/src/main/java/com/google/android/mms/pdu_alt/NotifyRespInd.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.mms.pdu; +package com.google.android.mms.pdu_alt; import com.google.android.mms.InvalidHeaderValueException; diff --git a/google-mms/src/main/java/com/google/android/mms/pdu/PduBody.java b/google-mms/src/main/java/com/google/android/mms/pdu_alt/PduBody.java similarity index 99% rename from google-mms/src/main/java/com/google/android/mms/pdu/PduBody.java rename to google-mms/src/main/java/com/google/android/mms/pdu_alt/PduBody.java index 751ea66e..d5f4252d 100644 --- a/google-mms/src/main/java/com/google/android/mms/pdu/PduBody.java +++ b/google-mms/src/main/java/com/google/android/mms/pdu_alt/PduBody.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.mms.pdu; +package com.google.android.mms.pdu_alt; import java.util.HashMap; import java.util.Map; diff --git a/google-mms/src/main/java/com/google/android/mms/pdu/PduContentTypes.java b/google-mms/src/main/java/com/google/android/mms/pdu_alt/PduContentTypes.java similarity index 99% rename from google-mms/src/main/java/com/google/android/mms/pdu/PduContentTypes.java rename to google-mms/src/main/java/com/google/android/mms/pdu_alt/PduContentTypes.java index 799e4cb7..604b8b1f 100644 --- a/google-mms/src/main/java/com/google/android/mms/pdu/PduContentTypes.java +++ b/google-mms/src/main/java/com/google/android/mms/pdu_alt/PduContentTypes.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.mms.pdu; +package com.google.android.mms.pdu_alt; public class PduContentTypes { /** diff --git a/google-mms/src/main/java/com/google/android/mms/pdu/PduHeaders.java b/google-mms/src/main/java/com/google/android/mms/pdu_alt/PduHeaders.java similarity index 99% rename from google-mms/src/main/java/com/google/android/mms/pdu/PduHeaders.java rename to google-mms/src/main/java/com/google/android/mms/pdu_alt/PduHeaders.java index 53867c3b..8d28cb88 100644 --- a/google-mms/src/main/java/com/google/android/mms/pdu/PduHeaders.java +++ b/google-mms/src/main/java/com/google/android/mms/pdu_alt/PduHeaders.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.mms.pdu; +package com.google.android.mms.pdu_alt; import com.google.android.mms.InvalidHeaderValueException; diff --git a/google-mms/src/main/java/com/google/android/mms/pdu/PduParser.java b/google-mms/src/main/java/com/google/android/mms/pdu_alt/PduParser.java similarity index 99% rename from google-mms/src/main/java/com/google/android/mms/pdu/PduParser.java rename to google-mms/src/main/java/com/google/android/mms/pdu_alt/PduParser.java index 6c2cf5bd..b6e82350 100644 --- a/google-mms/src/main/java/com/google/android/mms/pdu/PduParser.java +++ b/google-mms/src/main/java/com/google/android/mms/pdu_alt/PduParser.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.mms.pdu; +package com.google.android.mms.pdu_alt; import android.telephony.SmsManager; import android.util.Log; diff --git a/google-mms/src/main/java/com/google/android/mms/pdu/PduPart.java b/google-mms/src/main/java/com/google/android/mms/pdu_alt/PduPart.java similarity index 99% rename from google-mms/src/main/java/com/google/android/mms/pdu/PduPart.java rename to google-mms/src/main/java/com/google/android/mms/pdu_alt/PduPart.java index 9443f175..8241030b 100644 --- a/google-mms/src/main/java/com/google/android/mms/pdu/PduPart.java +++ b/google-mms/src/main/java/com/google/android/mms/pdu_alt/PduPart.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.mms.pdu; +package com.google.android.mms.pdu_alt; import android.net.Uri; diff --git a/google-mms/src/main/java/com/google/android/mms/pdu/PduPersister.java b/google-mms/src/main/java/com/google/android/mms/pdu_alt/PduPersister.java similarity index 99% rename from google-mms/src/main/java/com/google/android/mms/pdu/PduPersister.java rename to google-mms/src/main/java/com/google/android/mms/pdu_alt/PduPersister.java index 1c985d83..ec407338 100644 --- a/google-mms/src/main/java/com/google/android/mms/pdu/PduPersister.java +++ b/google-mms/src/main/java/com/google/android/mms/pdu_alt/PduPersister.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.mms.pdu; +package com.google.android.mms.pdu_alt; import com.google.android.mms.ContentType; import com.google.android.mms.InvalidHeaderValueException; import com.google.android.mms.MmsException; -import com.google.android.mms.util.DownloadDrmHelper; -import com.google.android.mms.util.DrmConvertSession; -import com.google.android.mms.util.PduCache; -import com.google.android.mms.util.PduCacheEntry; -import com.google.android.mms.util.SqliteWrapper; +import com.google.android.mms.util_alt.DownloadDrmHelper; +import com.google.android.mms.util_alt.DrmConvertSession; +import com.google.android.mms.util_alt.PduCache; +import com.google.android.mms.util_alt.PduCacheEntry; +import com.google.android.mms.util_alt.SqliteWrapper; import android.content.ContentResolver; import android.content.ContentUris; import android.content.ContentValues; @@ -57,7 +57,7 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; import java.util.Map.Entry; -import com.google.android.mms.pdu.EncodedStringValue; + /** * This class is the high-level manager of PDU storage. */ diff --git a/google-mms/src/main/java/com/google/android/mms/pdu/QuotedPrintable.java b/google-mms/src/main/java/com/google/android/mms/pdu_alt/QuotedPrintable.java similarity index 98% rename from google-mms/src/main/java/com/google/android/mms/pdu/QuotedPrintable.java rename to google-mms/src/main/java/com/google/android/mms/pdu_alt/QuotedPrintable.java index d2865001..9b796b5c 100644 --- a/google-mms/src/main/java/com/google/android/mms/pdu/QuotedPrintable.java +++ b/google-mms/src/main/java/com/google/android/mms/pdu_alt/QuotedPrintable.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.mms.pdu; +package com.google.android.mms.pdu_alt; import java.io.ByteArrayOutputStream; diff --git a/google-mms/src/main/java/com/google/android/mms/pdu/ReadOrigInd.java b/google-mms/src/main/java/com/google/android/mms/pdu_alt/ReadOrigInd.java similarity index 99% rename from google-mms/src/main/java/com/google/android/mms/pdu/ReadOrigInd.java rename to google-mms/src/main/java/com/google/android/mms/pdu_alt/ReadOrigInd.java index 965474d3..cc90f75e 100644 --- a/google-mms/src/main/java/com/google/android/mms/pdu/ReadOrigInd.java +++ b/google-mms/src/main/java/com/google/android/mms/pdu_alt/ReadOrigInd.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.mms.pdu; +package com.google.android.mms.pdu_alt; import com.google.android.mms.InvalidHeaderValueException; diff --git a/google-mms/src/main/java/com/google/android/mms/pdu/ReadRecInd.java b/google-mms/src/main/java/com/google/android/mms/pdu_alt/ReadRecInd.java similarity index 99% rename from google-mms/src/main/java/com/google/android/mms/pdu/ReadRecInd.java rename to google-mms/src/main/java/com/google/android/mms/pdu_alt/ReadRecInd.java index 922e6f51..209fefac 100644 --- a/google-mms/src/main/java/com/google/android/mms/pdu/ReadRecInd.java +++ b/google-mms/src/main/java/com/google/android/mms/pdu_alt/ReadRecInd.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.mms.pdu; +package com.google.android.mms.pdu_alt; import com.google.android.mms.InvalidHeaderValueException; diff --git a/google-mms/src/main/java/com/google/android/mms/pdu/RetrieveConf.java b/google-mms/src/main/java/com/google/android/mms/pdu_alt/RetrieveConf.java similarity index 99% rename from google-mms/src/main/java/com/google/android/mms/pdu/RetrieveConf.java rename to google-mms/src/main/java/com/google/android/mms/pdu_alt/RetrieveConf.java index 39741485..46890047 100644 --- a/google-mms/src/main/java/com/google/android/mms/pdu/RetrieveConf.java +++ b/google-mms/src/main/java/com/google/android/mms/pdu_alt/RetrieveConf.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.mms.pdu; +package com.google.android.mms.pdu_alt; import com.google.android.mms.InvalidHeaderValueException; diff --git a/google-mms/src/main/java/com/google/android/mms/pdu/SendConf.java b/google-mms/src/main/java/com/google/android/mms/pdu_alt/SendConf.java similarity index 98% rename from google-mms/src/main/java/com/google/android/mms/pdu/SendConf.java rename to google-mms/src/main/java/com/google/android/mms/pdu_alt/SendConf.java index f06842eb..cc99a97d 100644 --- a/google-mms/src/main/java/com/google/android/mms/pdu/SendConf.java +++ b/google-mms/src/main/java/com/google/android/mms/pdu_alt/SendConf.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.mms.pdu; +package com.google.android.mms.pdu_alt; import com.google.android.mms.InvalidHeaderValueException; diff --git a/google-mms/src/main/java/com/google/android/mms/pdu/SendReq.java b/google-mms/src/main/java/com/google/android/mms/pdu_alt/SendReq.java similarity index 99% rename from google-mms/src/main/java/com/google/android/mms/pdu/SendReq.java rename to google-mms/src/main/java/com/google/android/mms/pdu_alt/SendReq.java index 2015120a..fe0c1c8c 100644 --- a/google-mms/src/main/java/com/google/android/mms/pdu/SendReq.java +++ b/google-mms/src/main/java/com/google/android/mms/pdu_alt/SendReq.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.mms.pdu; +package com.google.android.mms.pdu_alt; import android.util.Log; import com.google.android.mms.InvalidHeaderValueException; diff --git a/google-mms/src/main/java/com/google/android/mms/util/AbstractCache.java b/google-mms/src/main/java/com/google/android/mms/util_alt/AbstractCache.java similarity index 98% rename from google-mms/src/main/java/com/google/android/mms/util/AbstractCache.java rename to google-mms/src/main/java/com/google/android/mms/util_alt/AbstractCache.java index 93adc9fc..3128c384 100644 --- a/google-mms/src/main/java/com/google/android/mms/util/AbstractCache.java +++ b/google-mms/src/main/java/com/google/android/mms/util_alt/AbstractCache.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.mms.util; +package com.google.android.mms.util_alt; import android.util.Log; diff --git a/google-mms/src/main/java/com/google/android/mms/util/DownloadDrmHelper.java b/google-mms/src/main/java/com/google/android/mms/util_alt/DownloadDrmHelper.java similarity index 99% rename from google-mms/src/main/java/com/google/android/mms/util/DownloadDrmHelper.java rename to google-mms/src/main/java/com/google/android/mms/util_alt/DownloadDrmHelper.java index 2c1279f2..06c221e4 100644 --- a/google-mms/src/main/java/com/google/android/mms/util/DownloadDrmHelper.java +++ b/google-mms/src/main/java/com/google/android/mms/util_alt/DownloadDrmHelper.java @@ -14,7 +14,7 @@ * limitations under the License. * */ -package com.google.android.mms.util; +package com.google.android.mms.util_alt; import android.content.Context; import android.drm.DrmManagerClient; diff --git a/google-mms/src/main/java/com/google/android/mms/util/DrmConvertSession.java b/google-mms/src/main/java/com/google/android/mms/util_alt/DrmConvertSession.java similarity index 99% rename from google-mms/src/main/java/com/google/android/mms/util/DrmConvertSession.java rename to google-mms/src/main/java/com/google/android/mms/util_alt/DrmConvertSession.java index 1d6e0616..66006055 100644 --- a/google-mms/src/main/java/com/google/android/mms/util/DrmConvertSession.java +++ b/google-mms/src/main/java/com/google/android/mms/util_alt/DrmConvertSession.java @@ -14,7 +14,7 @@ * limitations under the License. * */ -package com.google.android.mms.util; +package com.google.android.mms.util_alt; import android.content.Context; import android.drm.DrmConvertedStatus; diff --git a/google-mms/src/main/java/com/google/android/mms/util/PduCache.java b/google-mms/src/main/java/com/google/android/mms/util_alt/PduCache.java similarity index 99% rename from google-mms/src/main/java/com/google/android/mms/util/PduCache.java rename to google-mms/src/main/java/com/google/android/mms/util_alt/PduCache.java index 727d30fd..deb85022 100644 --- a/google-mms/src/main/java/com/google/android/mms/util/PduCache.java +++ b/google-mms/src/main/java/com/google/android/mms/util_alt/PduCache.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.mms.util; +package com.google.android.mms.util_alt; import android.content.ContentUris; import android.content.UriMatcher; diff --git a/google-mms/src/main/java/com/google/android/mms/util/PduCacheEntry.java b/google-mms/src/main/java/com/google/android/mms/util_alt/PduCacheEntry.java similarity index 92% rename from google-mms/src/main/java/com/google/android/mms/util/PduCacheEntry.java rename to google-mms/src/main/java/com/google/android/mms/util_alt/PduCacheEntry.java index 740572a9..b5e71afc 100644 --- a/google-mms/src/main/java/com/google/android/mms/util/PduCacheEntry.java +++ b/google-mms/src/main/java/com/google/android/mms/util_alt/PduCacheEntry.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.mms.util; +package com.google.android.mms.util_alt; -import com.google.android.mms.pdu.GenericPdu; +import com.google.android.mms.pdu_alt.GenericPdu; public final class PduCacheEntry { private final GenericPdu mPdu; diff --git a/google-mms/src/main/java/com/google/android/mms/util/SqliteWrapper.java b/google-mms/src/main/java/com/google/android/mms/util_alt/SqliteWrapper.java similarity index 99% rename from google-mms/src/main/java/com/google/android/mms/util/SqliteWrapper.java rename to google-mms/src/main/java/com/google/android/mms/util_alt/SqliteWrapper.java index d6601ebf..c8926f2b 100644 --- a/google-mms/src/main/java/com/google/android/mms/util/SqliteWrapper.java +++ b/google-mms/src/main/java/com/google/android/mms/util_alt/SqliteWrapper.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.mms.util; +package com.google.android.mms.util_alt; import android.app.ActivityManager; import android.content.ContentResolver; diff --git a/qksms/src/main/java/presentation/receiver/MmsReceiver.kt b/qksms/src/main/java/presentation/receiver/MmsReceiver.kt index 8d583f22..77bee2f1 100644 --- a/qksms/src/main/java/presentation/receiver/MmsReceiver.kt +++ b/qksms/src/main/java/presentation/receiver/MmsReceiver.kt @@ -23,16 +23,16 @@ import android.content.Context import android.content.Intent import android.provider.Telephony import com.google.android.mms.ContentType -import com.google.android.mms.pdu.GenericPdu -import com.google.android.mms.pdu.NotificationInd -import com.google.android.mms.pdu.PduHeaders -import com.google.android.mms.pdu.PduParser +import com.google.android.mms.pdu_alt.GenericPdu +import com.google.android.mms.pdu_alt.NotificationInd +import com.google.android.mms.pdu_alt.PduHeaders +import com.google.android.mms.pdu_alt.PduParser import timber.log.Timber class MmsReceiver : BroadcastReceiver() { override fun onReceive(context: Context, intent: Intent) { - if (Telephony.Sms.Intents.WAP_PUSH_RECEIVED_ACTION == intent.action && ContentType.MMS_MESSAGE == intent.type) { + if (Telephony.Sms.Intents.WAP_PUSH_DELIVER_ACTION == intent.action && ContentType.MMS_MESSAGE == intent.type) { val data = intent.getByteArrayExtra("data") val parser = PduParser(data) var pdu: GenericPdu? = null @@ -62,6 +62,10 @@ class MmsReceiver : BroadcastReceiver() { PduHeaders.MESSAGE_TYPE_READ_ORIG_IND -> { Timber.v("Received read report") } + + else -> { + Timber.v("Received unhandled MMS type: ${pdu.messageType}") + } } } }