Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: move com.google.android conflicts to com.android #3

Open
wants to merge 1 commit into
base: feature/lightos
Choose a base branch
from
Open

fix: move com.google.android conflicts to com.android #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...a/com/google/android/mms/ContentType.java → ...ain/java/com/android/mms/ContentType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* limitations under the License.
*/

package com.google.android.mms;
package com.android.mms;

import java.util.ArrayList;

Expand Down
2 changes: 1 addition & 1 deletion ...roid/mms/InvalidHeaderValueException.java → ...roid/mms/InvalidHeaderValueException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion .../com/google/android/mms/MmsException.java → ...in/java/com/android/mms/MmsException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion library/src/main/java/com/android/mms/dom/smil/parser/SmilXmlParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
5 changes: 1 addition & 4 deletions library/src/main/java/com/android/mms/service_alt/DownloadRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,13 @@
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;
import android.database.Cursor;
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;

Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion library/src/main/java/com/android/mms/service_alt/MmsRequestManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 0 additions & 2 deletions library/src/main/java/com/android/mms/service_alt/SendRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions library/src/main/java/com/android/mms/transaction/MessageSender.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = ";";
Expand All @@ -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;
}
4 changes: 2 additions & 2 deletions library/src/main/java/com/android/mms/transaction/MmsMessageSender.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion library/src/main/java/com/android/mms/transaction/NotificationTransaction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
5 changes: 2 additions & 3 deletions library/src/main/java/com/android/mms/transaction/PushReceiver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion library/src/main/java/com/android/mms/transaction/ReadRecTransaction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion library/src/main/java/com/android/mms/transaction/RetrieveTransaction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
13 changes: 5 additions & 8 deletions library/src/main/java/com/android/mms/transaction/Transaction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down Expand Up @@ -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,
Expand All @@ -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);
Expand All @@ -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());
Expand All @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion library/src/main/java/com/android/mms/transaction/TransactionService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion library/src/main/java/com/android/mms/util/DownloadManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion library/src/main/java/com/google/android/mms/pdu_alt/AcknowledgeInd.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion library/src/main/java/com/google/android/mms/pdu_alt/DeliveryInd.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion library/src/main/java/com/google/android/mms/pdu_alt/GenericPdu.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
/**
Expand Down
2 changes: 1 addition & 1 deletion library/src/main/java/com/google/android/mms/pdu_alt/MultimediaMessagePdu.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion library/src/main/java/com/google/android/mms/pdu_alt/NotificationInd.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion library/src/main/java/com/google/android/mms/pdu_alt/NotifyRespInd.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion library/src/main/java/com/google/android/mms/pdu_alt/PduHeaders.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions library/src/main/java/com/google/android/mms/pdu_alt/PduParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
6 changes: 3 additions & 3 deletions library/src/main/java/com/google/android/mms/pdu_alt/PduPersister.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion library/src/main/java/com/google/android/mms/pdu_alt/ReadOrigInd.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
/**
Expand Down
2 changes: 1 addition & 1 deletion library/src/main/java/com/google/android/mms/pdu_alt/ReadRecInd.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
/**
Expand Down
2 changes: 1 addition & 1 deletion library/src/main/java/com/google/android/mms/pdu_alt/RetrieveConf.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion library/src/main/java/com/google/android/mms/pdu_alt/SendConf.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
/**
Expand Down
2 changes: 1 addition & 1 deletion library/src/main/java/com/google/android/mms/pdu_alt/SendReq.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion library/src/main/java/com/google/android/mms/smil/SmilHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;
Expand Down
Loading