From e34f248019c8fb3be091bbabd071b294cd5f69d9 Mon Sep 17 00:00:00 2001 From: breannamporter Date: Wed, 4 Sep 2024 14:38:45 -0400 Subject: [PATCH] move com.google.android conflicts to com.android --- .../com/{google => }/android/mms/ContentType.java | 2 +- .../android/mms/InvalidHeaderValueException.java | 2 +- .../com/{google => }/android/mms/MmsException.java | 2 +- .../android/mms/dom/smil/parser/SmilXmlParser.java | 2 +- .../android/mms/service_alt/DownloadRequest.java | 5 +---- .../android/mms/service_alt/MmsRequestManager.java | 2 +- .../com/android/mms/service_alt/SendRequest.java | 2 -- .../com/android/mms/transaction/MessageSender.java | 4 ++-- .../android/mms/transaction/MmsMessageSender.java | 4 ++-- .../mms/transaction/NotificationTransaction.java | 2 +- .../com/android/mms/transaction/PushReceiver.java | 5 ++--- .../android/mms/transaction/ReadRecTransaction.java | 2 +- .../mms/transaction/RetrieveTransaction.java | 2 +- .../com/android/mms/transaction/Transaction.java | 13 +++++-------- .../android/mms/transaction/TransactionService.java | 2 +- .../java/com/android/mms/util/DownloadManager.java | 2 +- .../google/android/mms/pdu_alt/AcknowledgeInd.java | 2 +- .../com/google/android/mms/pdu_alt/DeliveryInd.java | 2 +- .../com/google/android/mms/pdu_alt/GenericPdu.java | 2 +- .../android/mms/pdu_alt/MultimediaMessagePdu.java | 2 +- .../google/android/mms/pdu_alt/NotificationInd.java | 2 +- .../google/android/mms/pdu_alt/NotifyRespInd.java | 2 +- .../com/google/android/mms/pdu_alt/PduHeaders.java | 2 +- .../com/google/android/mms/pdu_alt/PduParser.java | 4 ++-- .../google/android/mms/pdu_alt/PduPersister.java | 6 +++--- .../com/google/android/mms/pdu_alt/ReadOrigInd.java | 2 +- .../com/google/android/mms/pdu_alt/ReadRecInd.java | 2 +- .../google/android/mms/pdu_alt/RetrieveConf.java | 2 +- .../com/google/android/mms/pdu_alt/SendConf.java | 2 +- .../com/google/android/mms/pdu_alt/SendReq.java | 2 +- .../com/google/android/mms/smil/SmilHelper.java | 2 +- .../android/send_message/MmsReceivedReceiver.java | 10 +++++----- .../android/send_message/MmsReceivedService.java | 10 +++++----- .../klinker/android/send_message/Transaction.java | 3 +++ 34 files changed, 53 insertions(+), 59 deletions(-) rename library/src/main/java/com/{google => }/android/mms/ContentType.java (99%) rename library/src/main/java/com/{google => }/android/mms/InvalidHeaderValueException.java (97%) rename library/src/main/java/com/{google => }/android/mms/MmsException.java (98%) diff --git a/library/src/main/java/com/google/android/mms/ContentType.java b/library/src/main/java/com/android/mms/ContentType.java similarity index 99% rename from library/src/main/java/com/google/android/mms/ContentType.java rename to library/src/main/java/com/android/mms/ContentType.java index 9dad6c5e..14f509dd 100644 --- a/library/src/main/java/com/google/android/mms/ContentType.java +++ b/library/src/main/java/com/android/mms/ContentType.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.google.android.mms; +package com.android.mms; import java.util.ArrayList; diff --git a/library/src/main/java/com/google/android/mms/InvalidHeaderValueException.java b/library/src/main/java/com/android/mms/InvalidHeaderValueException.java similarity index 97% rename from library/src/main/java/com/google/android/mms/InvalidHeaderValueException.java rename to library/src/main/java/com/android/mms/InvalidHeaderValueException.java index 73d78328..6da0fa39 100644 --- a/library/src/main/java/com/google/android/mms/InvalidHeaderValueException.java +++ b/library/src/main/java/com/android/mms/InvalidHeaderValueException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.google.android.mms; +package com.android.mms; /** * Thrown when an invalid header value was set. diff --git a/library/src/main/java/com/google/android/mms/MmsException.java b/library/src/main/java/com/android/mms/MmsException.java similarity index 98% rename from library/src/main/java/com/google/android/mms/MmsException.java rename to library/src/main/java/com/android/mms/MmsException.java index 6ca0c7ea..d084bea7 100644 --- a/library/src/main/java/com/google/android/mms/MmsException.java +++ b/library/src/main/java/com/android/mms/MmsException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.google.android.mms; +package com.android.mms; /** * A generic exception that is thrown by the Mms client. diff --git a/library/src/main/java/com/android/mms/dom/smil/parser/SmilXmlParser.java b/library/src/main/java/com/android/mms/dom/smil/parser/SmilXmlParser.java index 969113a7..636785dd 100644 --- a/library/src/main/java/com/android/mms/dom/smil/parser/SmilXmlParser.java +++ b/library/src/main/java/com/android/mms/dom/smil/parser/SmilXmlParser.java @@ -26,7 +26,7 @@ import org.xml.sax.XMLReader; import org.xml.sax.helpers.XMLReaderFactory; -import com.google.android.mms.MmsException; +import com.android.mms.MmsException; public class SmilXmlParser { private XMLReader mXmlReader; diff --git a/library/src/main/java/com/android/mms/service_alt/DownloadRequest.java b/library/src/main/java/com/android/mms/service_alt/DownloadRequest.java index 9a936d98..4ba29497 100644 --- a/library/src/main/java/com/android/mms/service_alt/DownloadRequest.java +++ b/library/src/main/java/com/android/mms/service_alt/DownloadRequest.java @@ -17,8 +17,6 @@ package com.android.mms.service_alt; import android.app.PendingIntent; -import android.content.ContentResolver; -import android.content.ContentUris; import android.content.ContentValues; import android.content.Context; import android.content.Intent; @@ -26,7 +24,6 @@ import android.database.sqlite.SQLiteException; import android.net.Uri; import android.os.Binder; -import android.os.Build; import android.os.Bundle; import android.provider.Telephony; @@ -35,7 +32,7 @@ import com.android.mms.service_alt.exception.MmsHttpException; -import com.google.android.mms.MmsException; +import com.android.mms.MmsException; import com.google.android.mms.pdu_alt.GenericPdu; import com.google.android.mms.pdu_alt.PduHeaders; import com.google.android.mms.pdu_alt.PduParser; diff --git a/library/src/main/java/com/android/mms/service_alt/MmsRequestManager.java b/library/src/main/java/com/android/mms/service_alt/MmsRequestManager.java index 8e1d6c57..86cf05ba 100644 --- a/library/src/main/java/com/android/mms/service_alt/MmsRequestManager.java +++ b/library/src/main/java/com/android/mms/service_alt/MmsRequestManager.java @@ -24,7 +24,7 @@ import android.util.Log; import com.android.mms.transaction.NotificationTransaction; -import com.google.android.mms.MmsException; +import com.android.mms.MmsException; import com.google.android.mms.pdu_alt.PduParser; import com.google.android.mms.pdu_alt.PduPersister; import com.google.android.mms.pdu_alt.RetrieveConf; diff --git a/library/src/main/java/com/android/mms/service_alt/SendRequest.java b/library/src/main/java/com/android/mms/service_alt/SendRequest.java index 6646617b..6350dd35 100644 --- a/library/src/main/java/com/android/mms/service_alt/SendRequest.java +++ b/library/src/main/java/com/android/mms/service_alt/SendRequest.java @@ -23,7 +23,6 @@ import android.content.Intent; import android.net.Uri; import android.os.Binder; -import android.os.Build; import android.os.Bundle; import android.provider.Telephony; import android.telephony.SmsManager; @@ -32,7 +31,6 @@ import com.android.mms.service_alt.exception.MmsHttpException; -import com.google.android.mms.MmsException; import com.google.android.mms.pdu_alt.GenericPdu; import com.google.android.mms.pdu_alt.PduHeaders; import com.google.android.mms.pdu_alt.PduParser; diff --git a/library/src/main/java/com/android/mms/transaction/MessageSender.java b/library/src/main/java/com/android/mms/transaction/MessageSender.java index 880ba09f..ad442b20 100644 --- a/library/src/main/java/com/android/mms/transaction/MessageSender.java +++ b/library/src/main/java/com/android/mms/transaction/MessageSender.java @@ -16,7 +16,7 @@ package com.android.mms.transaction; -import com.google.android.mms.MmsException; +import com.android.mms.MmsException; public interface MessageSender { public static final String RECIPIENTS_SEPARATOR = ";"; @@ -27,7 +27,7 @@ public interface MessageSender { * * @return True if the message was sent through MMS or false if it was * sent through SMS. - * @throws com.google.android.mms.MmsException Error occurred while sending the message. + * @throws MmsException Error occurred while sending the message. */ boolean sendMessage(long token) throws MmsException; } diff --git a/library/src/main/java/com/android/mms/transaction/MmsMessageSender.java b/library/src/main/java/com/android/mms/transaction/MmsMessageSender.java index b3e4f152..2dc8b681 100644 --- a/library/src/main/java/com/android/mms/transaction/MmsMessageSender.java +++ b/library/src/main/java/com/android/mms/transaction/MmsMessageSender.java @@ -30,8 +30,8 @@ import com.android.mms.logs.LogTag; import com.android.mms.util.SendingProgressTokenManager; -import com.google.android.mms.InvalidHeaderValueException; -import com.google.android.mms.MmsException; +import com.android.mms.InvalidHeaderValueException; +import com.android.mms.MmsException; import com.google.android.mms.pdu_alt.EncodedStringValue; import com.google.android.mms.pdu_alt.GenericPdu; import com.google.android.mms.pdu_alt.PduHeaders; diff --git a/library/src/main/java/com/android/mms/transaction/NotificationTransaction.java b/library/src/main/java/com/android/mms/transaction/NotificationTransaction.java index 6f9f66e9..f83beacd 100644 --- a/library/src/main/java/com/android/mms/transaction/NotificationTransaction.java +++ b/library/src/main/java/com/android/mms/transaction/NotificationTransaction.java @@ -32,7 +32,7 @@ import com.android.mms.logs.LogTag; import com.android.mms.MmsConfig; import com.android.mms.util.DownloadManager; -import com.google.android.mms.MmsException; +import com.android.mms.MmsException; import com.google.android.mms.pdu_alt.GenericPdu; import com.google.android.mms.pdu_alt.NotificationInd; import com.google.android.mms.pdu_alt.NotifyRespInd; diff --git a/library/src/main/java/com/android/mms/transaction/PushReceiver.java b/library/src/main/java/com/android/mms/transaction/PushReceiver.java index c73105f7..27e9f165 100644 --- a/library/src/main/java/com/android/mms/transaction/PushReceiver.java +++ b/library/src/main/java/com/android/mms/transaction/PushReceiver.java @@ -28,7 +28,6 @@ import android.net.Uri; import android.os.AsyncTask; import android.os.Build; -import android.os.PowerManager; import android.preference.PreferenceManager; import android.provider.Telephony.Mms; import android.provider.Telephony.Mms.Inbox; @@ -38,8 +37,8 @@ import com.android.mms.service_alt.DownloadRequest; import com.android.mms.service_alt.MmsNetworkManager; import com.android.mms.service_alt.MmsRequestManager; -import com.google.android.mms.ContentType; -import com.google.android.mms.MmsException; +import com.android.mms.ContentType; +import com.android.mms.MmsException; import com.google.android.mms.pdu_alt.DeliveryInd; import com.google.android.mms.pdu_alt.GenericPdu; import com.google.android.mms.pdu_alt.NotificationInd; diff --git a/library/src/main/java/com/android/mms/transaction/ReadRecTransaction.java b/library/src/main/java/com/android/mms/transaction/ReadRecTransaction.java index 913e3ee9..a831c8fc 100644 --- a/library/src/main/java/com/android/mms/transaction/ReadRecTransaction.java +++ b/library/src/main/java/com/android/mms/transaction/ReadRecTransaction.java @@ -24,7 +24,7 @@ import com.klinker.android.logger.Log; import com.android.mms.logs.LogTag; -import com.google.android.mms.MmsException; +import com.android.mms.MmsException; import com.google.android.mms.pdu_alt.EncodedStringValue; import com.google.android.mms.pdu_alt.PduComposer; import com.google.android.mms.pdu_alt.PduPersister; diff --git a/library/src/main/java/com/android/mms/transaction/RetrieveTransaction.java b/library/src/main/java/com/android/mms/transaction/RetrieveTransaction.java index 6a6964ff..2ba05321 100644 --- a/library/src/main/java/com/android/mms/transaction/RetrieveTransaction.java +++ b/library/src/main/java/com/android/mms/transaction/RetrieveTransaction.java @@ -32,7 +32,7 @@ import com.android.mms.logs.LogTag; import com.android.mms.MmsConfig; import com.android.mms.util.DownloadManager; -import com.google.android.mms.MmsException; +import com.android.mms.MmsException; import com.google.android.mms.pdu_alt.AcknowledgeInd; import com.google.android.mms.pdu_alt.EncodedStringValue; import com.google.android.mms.pdu_alt.PduComposer; diff --git a/library/src/main/java/com/android/mms/transaction/Transaction.java b/library/src/main/java/com/android/mms/transaction/Transaction.java index 45ca11cd..490e9933 100644 --- a/library/src/main/java/com/android/mms/transaction/Transaction.java +++ b/library/src/main/java/com/android/mms/transaction/Transaction.java @@ -17,16 +17,13 @@ package com.android.mms.transaction; import java.io.IOException; -import java.net.InetAddress; -import java.net.UnknownHostException; import android.content.Context; import android.net.ConnectivityManager; import android.net.NetworkInfo; -import android.net.Uri; import com.android.mms.util.SendingProgressTokenManager; -import com.google.android.mms.MmsException; +import com.android.mms.MmsException; import com.klinker.android.send_message.Utils; /** @@ -116,7 +113,7 @@ public void setConnectionSettings(TransactionSettings settings) { * If an HTTP error code is returned, an IOException will be thrown. * @throws java.io.IOException if any error occurred on network interface or * an HTTP error code(>=400) returned from the server. - * @throws com.google.android.mms.MmsException if pdu is null. + * @throws MmsException if pdu is null. */ protected byte[] sendPdu(byte[] pdu) throws IOException, MmsException { return sendPdu(SendingProgressTokenManager.NO_TOKEN, pdu, @@ -132,7 +129,7 @@ protected byte[] sendPdu(byte[] pdu) throws IOException, MmsException { * If an HTTP error code is returned, an IOException will be thrown. * @throws java.io.IOException if any error occurred on network interface or * an HTTP error code(>=400) returned from the server. - * @throws com.google.android.mms.MmsException if pdu is null. + * @throws MmsException if pdu is null. */ protected byte[] sendPdu(byte[] pdu, String mmscUrl) throws IOException, MmsException { return sendPdu(SendingProgressTokenManager.NO_TOKEN, pdu, mmscUrl); @@ -147,7 +144,7 @@ protected byte[] sendPdu(byte[] pdu, String mmscUrl) throws IOException, MmsExce * If an HTTP error code is returned, an IOException will be thrown. * @throws java.io.IOException if any error occurred on network interface or * an HTTP error code(>=400) returned from the server. - * @throws com.google.android.mms.MmsException if pdu is null. + * @throws MmsException if pdu is null. */ protected byte[] sendPdu(long token, byte[] pdu) throws IOException, MmsException { return sendPdu(token, pdu, mTransactionSettings.getMmscUrl()); @@ -163,7 +160,7 @@ protected byte[] sendPdu(long token, byte[] pdu) throws IOException, MmsExceptio * If an HTTP error code is returned, an IOException will be thrown. * @throws java.io.IOException if any error occurred on network interface or * an HTTP error code(>=400) returned from the server. - * @throws com.google.android.mms.MmsException if pdu is null. + * @throws MmsException if pdu is null. */ protected byte[] sendPdu(final long token, final byte[] pdu, final String mmscUrl) throws IOException, MmsException { diff --git a/library/src/main/java/com/android/mms/transaction/TransactionService.java b/library/src/main/java/com/android/mms/transaction/TransactionService.java index 40a45b84..dca1db97 100644 --- a/library/src/main/java/com/android/mms/transaction/TransactionService.java +++ b/library/src/main/java/com/android/mms/transaction/TransactionService.java @@ -48,7 +48,7 @@ import com.android.mms.service_alt.MmsRequestManager; import com.android.mms.util.DownloadManager; import com.android.mms.util.RateController; -import com.google.android.mms.MmsException; +import com.android.mms.MmsException; import com.google.android.mms.pdu_alt.GenericPdu; import com.google.android.mms.pdu_alt.NotificationInd; import com.google.android.mms.pdu_alt.PduHeaders; diff --git a/library/src/main/java/com/android/mms/util/DownloadManager.java b/library/src/main/java/com/android/mms/util/DownloadManager.java index d2922f5d..081affe2 100644 --- a/library/src/main/java/com/android/mms/util/DownloadManager.java +++ b/library/src/main/java/com/android/mms/util/DownloadManager.java @@ -33,7 +33,7 @@ import com.android.internal.telephony.TelephonyProperties; import com.android.mms.service_alt.SystemPropertiesProxy; -import com.google.android.mms.MmsException; +import com.android.mms.MmsException; import com.google.android.mms.pdu_alt.EncodedStringValue; import com.google.android.mms.pdu_alt.NotificationInd; import com.google.android.mms.pdu_alt.PduPersister; diff --git a/library/src/main/java/com/google/android/mms/pdu_alt/AcknowledgeInd.java b/library/src/main/java/com/google/android/mms/pdu_alt/AcknowledgeInd.java index c3a5e5d6..558f6ec1 100644 --- a/library/src/main/java/com/google/android/mms/pdu_alt/AcknowledgeInd.java +++ b/library/src/main/java/com/google/android/mms/pdu_alt/AcknowledgeInd.java @@ -16,7 +16,7 @@ package com.google.android.mms.pdu_alt; -import com.google.android.mms.InvalidHeaderValueException; +import com.android.mms.InvalidHeaderValueException; /** * M-Acknowledge.ind PDU. diff --git a/library/src/main/java/com/google/android/mms/pdu_alt/DeliveryInd.java b/library/src/main/java/com/google/android/mms/pdu_alt/DeliveryInd.java index 149abe88..58ee0012 100644 --- a/library/src/main/java/com/google/android/mms/pdu_alt/DeliveryInd.java +++ b/library/src/main/java/com/google/android/mms/pdu_alt/DeliveryInd.java @@ -16,7 +16,7 @@ package com.google.android.mms.pdu_alt; -import com.google.android.mms.InvalidHeaderValueException; +import com.android.mms.InvalidHeaderValueException; /** * M-Delivery.Ind Pdu. diff --git a/library/src/main/java/com/google/android/mms/pdu_alt/GenericPdu.java b/library/src/main/java/com/google/android/mms/pdu_alt/GenericPdu.java index f918a3c1..49f36c92 100644 --- a/library/src/main/java/com/google/android/mms/pdu_alt/GenericPdu.java +++ b/library/src/main/java/com/google/android/mms/pdu_alt/GenericPdu.java @@ -16,7 +16,7 @@ package com.google.android.mms.pdu_alt; -import com.google.android.mms.InvalidHeaderValueException; +import com.android.mms.InvalidHeaderValueException; public class GenericPdu { /** diff --git a/library/src/main/java/com/google/android/mms/pdu_alt/MultimediaMessagePdu.java b/library/src/main/java/com/google/android/mms/pdu_alt/MultimediaMessagePdu.java index c99dc848..270691ae 100644 --- a/library/src/main/java/com/google/android/mms/pdu_alt/MultimediaMessagePdu.java +++ b/library/src/main/java/com/google/android/mms/pdu_alt/MultimediaMessagePdu.java @@ -16,7 +16,7 @@ package com.google.android.mms.pdu_alt; -import com.google.android.mms.InvalidHeaderValueException; +import com.android.mms.InvalidHeaderValueException; /** * Multimedia message PDU. diff --git a/library/src/main/java/com/google/android/mms/pdu_alt/NotificationInd.java b/library/src/main/java/com/google/android/mms/pdu_alt/NotificationInd.java index a45afc8f..67610ec1 100644 --- a/library/src/main/java/com/google/android/mms/pdu_alt/NotificationInd.java +++ b/library/src/main/java/com/google/android/mms/pdu_alt/NotificationInd.java @@ -16,7 +16,7 @@ package com.google.android.mms.pdu_alt; -import com.google.android.mms.InvalidHeaderValueException; +import com.android.mms.InvalidHeaderValueException; /** * M-Notification.ind PDU. diff --git a/library/src/main/java/com/google/android/mms/pdu_alt/NotifyRespInd.java b/library/src/main/java/com/google/android/mms/pdu_alt/NotifyRespInd.java index 2bd61304..f34363bc 100644 --- a/library/src/main/java/com/google/android/mms/pdu_alt/NotifyRespInd.java +++ b/library/src/main/java/com/google/android/mms/pdu_alt/NotifyRespInd.java @@ -16,7 +16,7 @@ package com.google.android.mms.pdu_alt; -import com.google.android.mms.InvalidHeaderValueException; +import com.android.mms.InvalidHeaderValueException; /** * M-NofifyResp.ind PDU. diff --git a/library/src/main/java/com/google/android/mms/pdu_alt/PduHeaders.java b/library/src/main/java/com/google/android/mms/pdu_alt/PduHeaders.java index 853f9f67..4234b8ef 100644 --- a/library/src/main/java/com/google/android/mms/pdu_alt/PduHeaders.java +++ b/library/src/main/java/com/google/android/mms/pdu_alt/PduHeaders.java @@ -16,7 +16,7 @@ package com.google.android.mms.pdu_alt; -import com.google.android.mms.InvalidHeaderValueException; +import com.android.mms.InvalidHeaderValueException; import java.util.ArrayList; import java.util.HashMap; diff --git a/library/src/main/java/com/google/android/mms/pdu_alt/PduParser.java b/library/src/main/java/com/google/android/mms/pdu_alt/PduParser.java index 04fac3df..ae19800b 100644 --- a/library/src/main/java/com/google/android/mms/pdu_alt/PduParser.java +++ b/library/src/main/java/com/google/android/mms/pdu_alt/PduParser.java @@ -17,8 +17,8 @@ package com.google.android.mms.pdu_alt; import com.android.mms.util.ExternalLogger; -import com.google.android.mms.ContentType; -import com.google.android.mms.InvalidHeaderValueException; +import com.android.mms.ContentType; +import com.android.mms.InvalidHeaderValueException; import com.klinker.android.logger.Log; diff --git a/library/src/main/java/com/google/android/mms/pdu_alt/PduPersister.java b/library/src/main/java/com/google/android/mms/pdu_alt/PduPersister.java index 3d50be4a..880e664f 100644 --- a/library/src/main/java/com/google/android/mms/pdu_alt/PduPersister.java +++ b/library/src/main/java/com/google/android/mms/pdu_alt/PduPersister.java @@ -39,9 +39,9 @@ import android.telephony.TelephonyManager; import android.text.TextUtils; -import com.google.android.mms.ContentType; -import com.google.android.mms.InvalidHeaderValueException; -import com.google.android.mms.MmsException; +import com.android.mms.ContentType; +import com.android.mms.InvalidHeaderValueException; +import com.android.mms.MmsException; import com.google.android.mms.util_alt.DownloadDrmHelper; import com.google.android.mms.util_alt.DrmConvertSession; import com.google.android.mms.util_alt.PduCache; diff --git a/library/src/main/java/com/google/android/mms/pdu_alt/ReadOrigInd.java b/library/src/main/java/com/google/android/mms/pdu_alt/ReadOrigInd.java index 42b22377..14d4c8bf 100644 --- a/library/src/main/java/com/google/android/mms/pdu_alt/ReadOrigInd.java +++ b/library/src/main/java/com/google/android/mms/pdu_alt/ReadOrigInd.java @@ -16,7 +16,7 @@ package com.google.android.mms.pdu_alt; -import com.google.android.mms.InvalidHeaderValueException; +import com.android.mms.InvalidHeaderValueException; public class ReadOrigInd extends GenericPdu { /** diff --git a/library/src/main/java/com/google/android/mms/pdu_alt/ReadRecInd.java b/library/src/main/java/com/google/android/mms/pdu_alt/ReadRecInd.java index b4de988f..67015dee 100644 --- a/library/src/main/java/com/google/android/mms/pdu_alt/ReadRecInd.java +++ b/library/src/main/java/com/google/android/mms/pdu_alt/ReadRecInd.java @@ -16,7 +16,7 @@ package com.google.android.mms.pdu_alt; -import com.google.android.mms.InvalidHeaderValueException; +import com.android.mms.InvalidHeaderValueException; public class ReadRecInd extends GenericPdu { /** diff --git a/library/src/main/java/com/google/android/mms/pdu_alt/RetrieveConf.java b/library/src/main/java/com/google/android/mms/pdu_alt/RetrieveConf.java index 24f4769e..70df9f85 100644 --- a/library/src/main/java/com/google/android/mms/pdu_alt/RetrieveConf.java +++ b/library/src/main/java/com/google/android/mms/pdu_alt/RetrieveConf.java @@ -16,7 +16,7 @@ package com.google.android.mms.pdu_alt; -import com.google.android.mms.InvalidHeaderValueException; +import com.android.mms.InvalidHeaderValueException; /** * M-Retrive.conf Pdu. diff --git a/library/src/main/java/com/google/android/mms/pdu_alt/SendConf.java b/library/src/main/java/com/google/android/mms/pdu_alt/SendConf.java index 0269cc65..569d4cc8 100644 --- a/library/src/main/java/com/google/android/mms/pdu_alt/SendConf.java +++ b/library/src/main/java/com/google/android/mms/pdu_alt/SendConf.java @@ -16,7 +16,7 @@ package com.google.android.mms.pdu_alt; -import com.google.android.mms.InvalidHeaderValueException; +import com.android.mms.InvalidHeaderValueException; public class SendConf extends GenericPdu { /** diff --git a/library/src/main/java/com/google/android/mms/pdu_alt/SendReq.java b/library/src/main/java/com/google/android/mms/pdu_alt/SendReq.java index ae964422..dd3eb812 100644 --- a/library/src/main/java/com/google/android/mms/pdu_alt/SendReq.java +++ b/library/src/main/java/com/google/android/mms/pdu_alt/SendReq.java @@ -18,7 +18,7 @@ import com.klinker.android.logger.Log; -import com.google.android.mms.InvalidHeaderValueException; +import com.android.mms.InvalidHeaderValueException; public class SendReq extends MultimediaMessagePdu { private static final String TAG = "SendReq"; diff --git a/library/src/main/java/com/google/android/mms/smil/SmilHelper.java b/library/src/main/java/com/google/android/mms/smil/SmilHelper.java index 1c581270..c65a8de9 100644 --- a/library/src/main/java/com/google/android/mms/smil/SmilHelper.java +++ b/library/src/main/java/com/google/android/mms/smil/SmilHelper.java @@ -2,7 +2,7 @@ import com.klinker.android.logger.Log; import com.android.mms.dom.smil.SmilDocumentImpl; -import com.google.android.mms.ContentType; +import com.android.mms.ContentType; import com.google.android.mms.pdu_alt.PduBody; import com.google.android.mms.pdu_alt.PduPart; import org.w3c.dom.smil.*; diff --git a/library/src/main/java/com/klinker/android/send_message/MmsReceivedReceiver.java b/library/src/main/java/com/klinker/android/send_message/MmsReceivedReceiver.java index 23f75044..196a3e3f 100644 --- a/library/src/main/java/com/klinker/android/send_message/MmsReceivedReceiver.java +++ b/library/src/main/java/com/klinker/android/send_message/MmsReceivedReceiver.java @@ -32,8 +32,8 @@ import com.android.mms.transaction.HttpUtils; import com.android.mms.transaction.TransactionSettings; import com.android.mms.util.SendingProgressTokenManager; -import com.google.android.mms.InvalidHeaderValueException; -import com.google.android.mms.MmsException; +import com.android.mms.InvalidHeaderValueException; +import com.android.mms.MmsException; import com.google.android.mms.pdu_alt.EncodedStringValue; import com.google.android.mms.pdu_alt.GenericPdu; import com.google.android.mms.pdu_alt.NotificationInd; @@ -197,7 +197,7 @@ private static abstract class CommonAsyncTask extends AsyncTask=400) returned from the server. - * @throws com.google.android.mms.MmsException if pdu is null. + * @throws MmsException if pdu is null. */ byte[] sendPdu(byte[] pdu, String mmscUrl) throws IOException, MmsException { return sendPdu(SendingProgressTokenManager.NO_TOKEN, pdu, mmscUrl); @@ -211,7 +211,7 @@ byte[] sendPdu(byte[] pdu, String mmscUrl) throws IOException, MmsException { * If an HTTP error code is returned, an IOException will be thrown. * @throws java.io.IOException if any error occurred on network interface or * an HTTP error code(>=400) returned from the server. - * @throws com.google.android.mms.MmsException if pdu is null. + * @throws MmsException if pdu is null. */ byte[] sendPdu(byte[] pdu) throws IOException, MmsException { return sendPdu(SendingProgressTokenManager.NO_TOKEN, pdu, @@ -228,7 +228,7 @@ byte[] sendPdu(byte[] pdu) throws IOException, MmsException { * If an HTTP error code is returned, an IOException will be thrown. * @throws java.io.IOException if any error occurred on network interface or * an HTTP error code(>=400) returned from the server. - * @throws com.google.android.mms.MmsException if pdu is null. + * @throws MmsException if pdu is null. */ private byte[] sendPdu(long token, byte[] pdu, String mmscUrl) throws IOException, MmsException { diff --git a/library/src/main/java/com/klinker/android/send_message/MmsReceivedService.java b/library/src/main/java/com/klinker/android/send_message/MmsReceivedService.java index 956f5323..b870ebe3 100644 --- a/library/src/main/java/com/klinker/android/send_message/MmsReceivedService.java +++ b/library/src/main/java/com/klinker/android/send_message/MmsReceivedService.java @@ -15,8 +15,8 @@ import com.android.mms.transaction.HttpUtils; import com.android.mms.transaction.TransactionSettings; import com.android.mms.util.SendingProgressTokenManager; -import com.google.android.mms.InvalidHeaderValueException; -import com.google.android.mms.MmsException; +import com.android.mms.InvalidHeaderValueException; +import com.android.mms.MmsException; import com.google.android.mms.pdu_alt.EncodedStringValue; import com.google.android.mms.pdu_alt.GenericPdu; import com.google.android.mms.pdu_alt.NotificationInd; @@ -144,7 +144,7 @@ private static abstract class CommonNotificationTask { * If an HTTP error code is returned, an IOException will be thrown. * @throws java.io.IOException if any error occurred on network interface or * an HTTP error code(>=400) returned from the server. - * @throws com.google.android.mms.MmsException if pdu is null. + * @throws MmsException if pdu is null. */ byte[] sendPdu(byte[] pdu, String mmscUrl) throws IOException, MmsException { return sendPdu(SendingProgressTokenManager.NO_TOKEN, pdu, mmscUrl); @@ -158,7 +158,7 @@ byte[] sendPdu(byte[] pdu, String mmscUrl) throws IOException, MmsException { * If an HTTP error code is returned, an IOException will be thrown. * @throws java.io.IOException if any error occurred on network interface or * an HTTP error code(>=400) returned from the server. - * @throws com.google.android.mms.MmsException if pdu is null. + * @throws MmsException if pdu is null. */ byte[] sendPdu(byte[] pdu) throws IOException, MmsException { return sendPdu(SendingProgressTokenManager.NO_TOKEN, pdu, @@ -175,7 +175,7 @@ byte[] sendPdu(byte[] pdu) throws IOException, MmsException { * If an HTTP error code is returned, an IOException will be thrown. * @throws java.io.IOException if any error occurred on network interface or * an HTTP error code(>=400) returned from the server. - * @throws com.google.android.mms.MmsException if pdu is null. + * @throws MmsException if pdu is null. */ private byte[] sendPdu(final long token, final byte[] pdu, final String mmscUrl) throws IOException, MmsException { diff --git a/library/src/main/java/com/klinker/android/send_message/Transaction.java b/library/src/main/java/com/klinker/android/send_message/Transaction.java index b0b50fe4..c5b3f27c 100644 --- a/library/src/main/java/com/klinker/android/send_message/Transaction.java +++ b/library/src/main/java/com/klinker/android/send_message/Transaction.java @@ -30,7 +30,10 @@ import android.telephony.SmsMessage; import android.text.TextUtils; +import com.android.mms.ContentType; +import com.android.mms.InvalidHeaderValueException; import com.android.mms.MmsConfig; +import com.android.mms.MmsException; import com.android.mms.service_alt.MmsNetworkManager; import com.android.mms.service_alt.MmsRequestManager; import com.android.mms.service_alt.SendRequest;