Optimize imports in android-smsmms module

This commit is contained in:
Moez Bhatti
2018-01-17 04:16:03 -05:00
parent bea4105f7a
commit fd95a4f1af
58 changed files with 112 additions and 176 deletions
@@ -22,8 +22,8 @@ import android.content.ContentValues;
import android.content.Context; import android.content.Context;
import android.database.Cursor; import android.database.Cursor;
import android.net.Uri; import android.net.Uri;
import com.klinker.android.logger.Log;
import android.widget.Toast; import android.widget.Toast;
import com.klinker.android.logger.Log;
/** /**
* @hide * @hide
@@ -21,7 +21,9 @@ import android.os.Parcelable;
import com.android.internal.annotations.VisibleForTesting; import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.util.Objects; import com.android.internal.util.Objects;
import static android.net.ConnectivityManager.*; import static android.net.ConnectivityManager.TYPE_ETHERNET;
import static android.net.ConnectivityManager.TYPE_WIFI;
import static android.net.ConnectivityManager.TYPE_WIMAX;
import static android.net.NetworkIdentity.COMBINE_SUBTYPE_ENABLED; import static android.net.NetworkIdentity.COMBINE_SUBTYPE_ENABLED;
import static android.net.NetworkIdentity.scrubSubscriberId; import static android.net.NetworkIdentity.scrubSubscriberId;
import static com.android.internal.util.ArrayUtils.contains; import static com.android.internal.util.ArrayUtils.contains;
@@ -17,8 +17,8 @@
package com.android.internal.telephony; package com.android.internal.telephony;
import android.text.TextUtils; import android.text.TextUtils;
import com.klinker.android.logger.Log;
import android.util.SparseIntArray; import android.util.SparseIntArray;
import com.klinker.android.logger.Log;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.nio.charset.Charset; import java.nio.charset.Charset;
@@ -16,15 +16,14 @@
package com.android.mms; package com.android.mms;
import java.io.IOException; import android.content.Context;
import android.content.res.XmlResourceParser;
import com.klinker.android.logger.Log;
import com.klinker.android.send_message.R; import com.klinker.android.send_message.R;
import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException; import org.xmlpull.v1.XmlPullParserException;
import android.content.Context; import java.io.IOException;
import android.content.res.XmlResourceParser;
import com.klinker.android.logger.Log;
public class MmsConfig { public class MmsConfig {
private static final String TAG = "MmsConfig"; private static final String TAG = "MmsConfig";
@@ -17,12 +17,12 @@
package com.android.mms.dom; package com.android.mms.dom;
import java.util.Vector;
import org.w3c.dom.DOMException; import org.w3c.dom.DOMException;
import org.w3c.dom.NamedNodeMap; import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node; import org.w3c.dom.Node;
import java.util.Vector;
public class NamedNodeMapImpl implements NamedNodeMap { public class NamedNodeMapImpl implements NamedNodeMap {
private Vector<Node> mNodes = new Vector<Node>(); private Vector<Node> mNodes = new Vector<Node>();
@@ -17,9 +17,7 @@
package com.android.mms.dom; package com.android.mms.dom;
import java.util.NoSuchElementException; import com.android.mms.dom.events.EventTargetImpl;
import java.util.Vector;
import org.w3c.dom.DOMException; import org.w3c.dom.DOMException;
import org.w3c.dom.Document; import org.w3c.dom.Document;
import org.w3c.dom.NamedNodeMap; import org.w3c.dom.NamedNodeMap;
@@ -31,7 +29,8 @@ import org.w3c.dom.events.EventException;
import org.w3c.dom.events.EventListener; import org.w3c.dom.events.EventListener;
import org.w3c.dom.events.EventTarget; import org.w3c.dom.events.EventTarget;
import com.android.mms.dom.events.EventTargetImpl; import java.util.NoSuchElementException;
import java.util.Vector;
public abstract class NodeImpl implements Node, EventTarget { public abstract class NodeImpl implements Node, EventTarget {
private Node mParentNode; private Node mParentNode;
@@ -17,11 +17,11 @@
package com.android.mms.dom; package com.android.mms.dom;
import java.util.ArrayList;
import org.w3c.dom.Node; import org.w3c.dom.Node;
import org.w3c.dom.NodeList; import org.w3c.dom.NodeList;
import java.util.ArrayList;
public class NodeListImpl implements NodeList { public class NodeListImpl implements NodeList {
private ArrayList<Node> mSearchNodes; private ArrayList<Node> mSearchNodes;
private ArrayList<Node> mStaticNodes; private ArrayList<Node> mStaticNodes;
@@ -17,15 +17,13 @@
package com.android.mms.dom.events; package com.android.mms.dom.events;
import com.android.mms.logs.LogTag; import com.android.mms.logs.LogTag;
import com.klinker.android.logger.Log;
import java.util.ArrayList;
import org.w3c.dom.events.Event; import org.w3c.dom.events.Event;
import org.w3c.dom.events.EventException; import org.w3c.dom.events.EventException;
import org.w3c.dom.events.EventListener; import org.w3c.dom.events.EventListener;
import org.w3c.dom.events.EventTarget; import org.w3c.dom.events.EventTarget;
import com.klinker.android.logger.Log; import java.util.ArrayList;
public class EventTargetImpl implements EventTarget { public class EventTargetImpl implements EventTarget {
private static final String TAG = LogTag.TAG; private static final String TAG = LogTag.TAG;
@@ -17,8 +17,7 @@
package com.android.mms.dom.smil; package com.android.mms.dom.smil;
import java.util.ArrayList; import com.android.mms.dom.NodeListImpl;
import org.w3c.dom.DOMException; import org.w3c.dom.DOMException;
import org.w3c.dom.Node; import org.w3c.dom.Node;
import org.w3c.dom.NodeList; import org.w3c.dom.NodeList;
@@ -28,7 +27,7 @@ import org.w3c.dom.smil.SMILElement;
import org.w3c.dom.smil.Time; import org.w3c.dom.smil.Time;
import org.w3c.dom.smil.TimeList; import org.w3c.dom.smil.TimeList;
import com.android.mms.dom.NodeListImpl; import java.util.ArrayList;
public abstract class ElementParallelTimeContainerImpl extends ElementTimeContainerImpl public abstract class ElementParallelTimeContainerImpl extends ElementTimeContainerImpl
implements ElementParallelTimeContainer { implements ElementParallelTimeContainer {
@@ -17,15 +17,14 @@
package com.android.mms.dom.smil; package com.android.mms.dom.smil;
import java.util.ArrayList; import com.android.mms.dom.NodeListImpl;
import org.w3c.dom.Node; import org.w3c.dom.Node;
import org.w3c.dom.NodeList; import org.w3c.dom.NodeList;
import org.w3c.dom.smil.ElementSequentialTimeContainer; import org.w3c.dom.smil.ElementSequentialTimeContainer;
import org.w3c.dom.smil.ElementTime; import org.w3c.dom.smil.ElementTime;
import org.w3c.dom.smil.SMILElement; import org.w3c.dom.smil.SMILElement;
import com.android.mms.dom.NodeListImpl; import java.util.ArrayList;
public abstract class ElementSequentialTimeContainerImpl extends public abstract class ElementSequentialTimeContainerImpl extends
ElementTimeContainerImpl implements ElementSequentialTimeContainer { ElementTimeContainerImpl implements ElementSequentialTimeContainer {
@@ -17,16 +17,14 @@
package com.android.mms.dom.smil; package com.android.mms.dom.smil;
import com.android.mms.logs.LogTag; import com.android.mms.logs.LogTag;
import com.klinker.android.logger.Log;
import java.util.ArrayList;
import org.w3c.dom.DOMException; import org.w3c.dom.DOMException;
import org.w3c.dom.smil.ElementTime; import org.w3c.dom.smil.ElementTime;
import org.w3c.dom.smil.SMILElement; import org.w3c.dom.smil.SMILElement;
import org.w3c.dom.smil.Time; import org.w3c.dom.smil.Time;
import org.w3c.dom.smil.TimeList; import org.w3c.dom.smil.TimeList;
import com.klinker.android.logger.Log; import java.util.ArrayList;
public abstract class ElementTimeImpl implements ElementTime { public abstract class ElementTimeImpl implements ElementTime {
private static final String TAG = LogTag.TAG; private static final String TAG = LogTag.TAG;
@@ -16,6 +16,8 @@
package com.android.mms.dom.smil; package com.android.mms.dom.smil;
import com.android.mms.dom.DocumentImpl;
import com.android.mms.dom.events.EventImpl;
import org.w3c.dom.DOMException; import org.w3c.dom.DOMException;
import org.w3c.dom.Element; import org.w3c.dom.Element;
import org.w3c.dom.Node; import org.w3c.dom.Node;
@@ -29,9 +31,6 @@ import org.w3c.dom.smil.SMILElement;
import org.w3c.dom.smil.SMILLayoutElement; import org.w3c.dom.smil.SMILLayoutElement;
import org.w3c.dom.smil.TimeList; import org.w3c.dom.smil.TimeList;
import com.android.mms.dom.DocumentImpl;
import com.android.mms.dom.events.EventImpl;
public class SmilDocumentImpl extends DocumentImpl implements SMILDocument, DocumentEvent { public class SmilDocumentImpl extends DocumentImpl implements SMILDocument, DocumentEvent {
/* /*
* The sequential time container cannot be initialized here because the real container * The sequential time container cannot be initialized here because the real container
@@ -17,11 +17,10 @@
package com.android.mms.dom.smil; package com.android.mms.dom.smil;
import com.android.mms.dom.ElementImpl;
import org.w3c.dom.DOMException; import org.w3c.dom.DOMException;
import org.w3c.dom.smil.SMILElement; import org.w3c.dom.smil.SMILElement;
import com.android.mms.dom.ElementImpl;
public class SmilElementImpl extends ElementImpl implements SMILElement { public class SmilElementImpl extends ElementImpl implements SMILElement {
/** /**
* This constructor is used by the factory methods of the SmilDocument. * This constructor is used by the factory methods of the SmilDocument.
@@ -17,12 +17,11 @@
package com.android.mms.dom.smil; package com.android.mms.dom.smil;
import com.android.mms.layout.LayoutManager;
import org.w3c.dom.NodeList; import org.w3c.dom.NodeList;
import org.w3c.dom.smil.SMILLayoutElement; import org.w3c.dom.smil.SMILLayoutElement;
import org.w3c.dom.smil.SMILRootLayoutElement; import org.w3c.dom.smil.SMILRootLayoutElement;
import com.android.mms.layout.LayoutManager;
public class SmilLayoutElementImpl extends SmilElementImpl implements public class SmilLayoutElementImpl extends SmilElementImpl implements
SMILLayoutElement { SMILLayoutElement {
SmilLayoutElementImpl(SmilDocumentImpl owner, String tagName) { SmilLayoutElementImpl(SmilDocumentImpl owner, String tagName) {
@@ -16,6 +16,9 @@
package com.android.mms.dom.smil; package com.android.mms.dom.smil;
import com.android.mms.dom.events.EventImpl;
import com.android.mms.logs.LogTag;
import com.klinker.android.logger.Log;
import org.w3c.dom.DOMException; import org.w3c.dom.DOMException;
import org.w3c.dom.events.DocumentEvent; import org.w3c.dom.events.DocumentEvent;
import org.w3c.dom.events.Event; import org.w3c.dom.events.Event;
@@ -23,11 +26,6 @@ import org.w3c.dom.smil.ElementTime;
import org.w3c.dom.smil.SMILMediaElement; import org.w3c.dom.smil.SMILMediaElement;
import org.w3c.dom.smil.TimeList; import org.w3c.dom.smil.TimeList;
import com.klinker.android.logger.Log;
import com.android.mms.logs.LogTag;
import com.android.mms.dom.events.EventImpl;
public class SmilMediaElementImpl extends SmilElementImpl implements public class SmilMediaElementImpl extends SmilElementImpl implements
SMILMediaElement { SMILMediaElement {
public final static String SMIL_MEDIA_START_EVENT = "SmilMediaStart"; public final static String SMIL_MEDIA_START_EVENT = "SmilMediaStart";
@@ -17,8 +17,6 @@
package com.android.mms.dom.smil; package com.android.mms.dom.smil;
import java.util.ArrayList;
import org.w3c.dom.DOMException; import org.w3c.dom.DOMException;
import org.w3c.dom.NodeList; import org.w3c.dom.NodeList;
import org.w3c.dom.events.DocumentEvent; import org.w3c.dom.events.DocumentEvent;
@@ -29,6 +27,8 @@ import org.w3c.dom.smil.SMILParElement;
import org.w3c.dom.smil.Time; import org.w3c.dom.smil.Time;
import org.w3c.dom.smil.TimeList; import org.w3c.dom.smil.TimeList;
import java.util.ArrayList;
public class SmilParElementImpl extends SmilElementImpl implements SMILParElement { public class SmilParElementImpl extends SmilElementImpl implements SMILParElement {
public final static String SMIL_SLIDE_START_EVENT = "SmilSlideStart"; public final static String SMIL_SLIDE_START_EVENT = "SmilSlideStart";
public final static String SMIL_SLIDE_END_EVENT = "SmilSlideEnd"; public final static String SMIL_SLIDE_END_EVENT = "SmilSlideEnd";
@@ -17,12 +17,7 @@
package com.android.mms.dom.smil; package com.android.mms.dom.smil;
import com.android.mms.logs.LogTag; import com.android.mms.logs.LogTag;
import com.klinker.android.logger.Log;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashSet;
import org.w3c.dom.NodeList; import org.w3c.dom.NodeList;
import org.w3c.dom.events.DocumentEvent; import org.w3c.dom.events.DocumentEvent;
import org.w3c.dom.events.Event; import org.w3c.dom.events.Event;
@@ -33,7 +28,10 @@ import org.w3c.dom.smil.ElementTime;
import org.w3c.dom.smil.Time; import org.w3c.dom.smil.Time;
import org.w3c.dom.smil.TimeList; import org.w3c.dom.smil.TimeList;
import com.klinker.android.logger.Log; import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashSet;
/** /**
* The SmilPlayer is responsible for playing, stopping, pausing and resuming a SMIL tree. * The SmilPlayer is responsible for playing, stopping, pausing and resuming a SMIL tree.
@@ -17,13 +17,11 @@
package com.android.mms.dom.smil; package com.android.mms.dom.smil;
import com.android.mms.logs.LogTag; import com.android.mms.logs.LogTag;
import com.klinker.android.logger.Log;
import org.w3c.dom.DOMException; import org.w3c.dom.DOMException;
import org.w3c.dom.smil.SMILDocument; import org.w3c.dom.smil.SMILDocument;
import org.w3c.dom.smil.SMILRegionElement; import org.w3c.dom.smil.SMILRegionElement;
import com.klinker.android.logger.Log;
public class SmilRegionElementImpl extends SmilElementImpl implements public class SmilRegionElementImpl extends SmilElementImpl implements
SMILRegionElement { SMILRegionElement {
@@ -17,11 +17,11 @@
package com.android.mms.dom.smil; package com.android.mms.dom.smil;
import java.util.ArrayList;
import org.w3c.dom.smil.Time; import org.w3c.dom.smil.Time;
import org.w3c.dom.smil.TimeList; import org.w3c.dom.smil.TimeList;
import java.util.ArrayList;
public class TimeListImpl implements TimeList { public class TimeListImpl implements TimeList {
private final ArrayList<Time> mTimes; private final ArrayList<Time> mTimes;
@@ -16,17 +16,15 @@
package com.android.mms.dom.smil.parser; package com.android.mms.dom.smil.parser;
import com.android.mms.dom.smil.SmilDocumentImpl;
import com.android.mms.logs.LogTag;
import com.klinker.android.logger.Log;
import org.w3c.dom.Element; import org.w3c.dom.Element;
import org.w3c.dom.Node; import org.w3c.dom.Node;
import org.w3c.dom.smil.SMILDocument; import org.w3c.dom.smil.SMILDocument;
import org.xml.sax.Attributes; import org.xml.sax.Attributes;
import org.xml.sax.helpers.DefaultHandler; import org.xml.sax.helpers.DefaultHandler;
import com.klinker.android.logger.Log;
import com.android.mms.logs.LogTag;
import com.android.mms.dom.smil.SmilDocumentImpl;
public class SmilContentHandler extends DefaultHandler { public class SmilContentHandler extends DefaultHandler {
private static final String TAG = LogTag.TAG; private static final String TAG = LogTag.TAG;
private static final boolean DEBUG = false; private static final boolean DEBUG = false;
@@ -17,16 +17,15 @@
package com.android.mms.dom.smil.parser; package com.android.mms.dom.smil.parser;
import java.io.IOException; import com.google.android.mms.MmsException;
import java.io.InputStream;
import org.w3c.dom.smil.SMILDocument; import org.w3c.dom.smil.SMILDocument;
import org.xml.sax.InputSource; import org.xml.sax.InputSource;
import org.xml.sax.SAXException; import org.xml.sax.SAXException;
import org.xml.sax.XMLReader; import org.xml.sax.XMLReader;
import org.xml.sax.helpers.XMLReaderFactory; import org.xml.sax.helpers.XMLReaderFactory;
import com.google.android.mms.MmsException; import java.io.IOException;
import java.io.InputStream;
public class SmilXmlParser { public class SmilXmlParser {
private XMLReader mXmlReader; private XMLReader mXmlReader;
@@ -16,13 +16,6 @@
package com.android.mms.dom.smil.parser; package com.android.mms.dom.smil.parser;
import java.io.BufferedWriter;
import java.io.IOException;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.UnsupportedEncodingException;
import java.io.Writer;
import com.klinker.android.logger.Log; import com.klinker.android.logger.Log;
import org.w3c.dom.Attr; import org.w3c.dom.Attr;
import org.w3c.dom.Element; import org.w3c.dom.Element;
@@ -30,6 +23,13 @@ import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.smil.SMILDocument; import org.w3c.dom.smil.SMILDocument;
import org.w3c.dom.smil.SMILElement; import org.w3c.dom.smil.SMILElement;
import java.io.BufferedWriter;
import java.io.IOException;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.UnsupportedEncodingException;
import java.io.Writer;
public class SmilXmlSerializer { public class SmilXmlSerializer {
private static final String TAG = "SmilXmlSerializer"; private static final String TAG = "SmilXmlSerializer";
@@ -16,9 +16,8 @@
package com.android.mms.layout; package com.android.mms.layout;
import com.android.mms.logs.LogTag;
import android.content.Context; import android.content.Context;
import com.android.mms.logs.LogTag;
import com.klinker.android.logger.Log; import com.klinker.android.logger.Log;
public class HVGALayoutParameters implements LayoutParameters { public class HVGALayoutParameters implements LayoutParameters {
@@ -16,10 +16,9 @@
package com.android.mms.layout; package com.android.mms.layout;
import com.android.mms.logs.LogTag;
import android.content.Context; import android.content.Context;
import android.content.res.Configuration; import android.content.res.Configuration;
import com.android.mms.logs.LogTag;
import com.klinker.android.logger.Log; import com.klinker.android.logger.Log;
/** /**
@@ -25,9 +25,8 @@ import android.net.Uri;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.provider.Telephony; import android.provider.Telephony;
import android.text.TextUtils; import android.text.TextUtils;
import com.klinker.android.logger.Log;
import com.android.mms.service_alt.exception.ApnException; import com.android.mms.service_alt.exception.ApnException;
import com.klinker.android.logger.Log;
import java.net.URI; import java.net.URI;
import java.net.URISyntaxException; import java.net.URISyntaxException;
@@ -17,8 +17,6 @@
package com.android.mms.service_alt; package com.android.mms.service_alt;
import android.app.PendingIntent; import android.app.PendingIntent;
import android.content.ContentResolver;
import android.content.ContentUris;
import android.content.ContentValues; import android.content.ContentValues;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
@@ -26,15 +24,11 @@ import android.database.Cursor;
import android.database.sqlite.SQLiteException; import android.database.sqlite.SQLiteException;
import android.net.Uri; import android.net.Uri;
import android.os.Binder; import android.os.Binder;
import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.provider.Telephony; import android.provider.Telephony;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import com.android.mms.service_alt.exception.MmsHttpException; import com.android.mms.service_alt.exception.MmsHttpException;
import com.google.android.mms.MmsException; import com.google.android.mms.MmsException;
import com.google.android.mms.pdu_alt.GenericPdu; import com.google.android.mms.pdu_alt.GenericPdu;
import com.google.android.mms.pdu_alt.PduHeaders; import com.google.android.mms.pdu_alt.PduHeaders;
@@ -25,7 +25,6 @@ import android.telephony.TelephonyManager;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Base64; import android.util.Base64;
import com.klinker.android.logger.Log; import com.klinker.android.logger.Log;
import com.klinker.android.send_message.R; import com.klinker.android.send_message.R;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
@@ -24,7 +24,6 @@ import android.content.res.Configuration;
import android.os.Build; import android.os.Build;
import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager; import android.telephony.SubscriptionManager;
import android.telephony.SubscriptionManager.OnSubscriptionsChangedListener;
import android.util.ArrayMap; import android.util.ArrayMap;
import com.klinker.android.logger.Log; import com.klinker.android.logger.Log;
@@ -16,11 +16,10 @@
package com.android.mms.service_alt; package com.android.mms.service_alt;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
import android.content.ContentValues; import android.content.ContentValues;
import com.klinker.android.logger.Log; import com.klinker.android.logger.Log;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
import java.io.IOException; import java.io.IOException;
@@ -19,7 +19,6 @@ package com.android.mms.service_alt;
import android.content.Context; import android.content.Context;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import com.android.mms.service_alt.exception.MmsHttpException; import com.android.mms.service_alt.exception.MmsHttpException;
import com.squareup.okhttp.ConnectionPool; import com.squareup.okhttp.ConnectionPool;
import com.squareup.okhttp.ConnectionSpec; import com.squareup.okhttp.ConnectionSpec;
@@ -31,6 +30,9 @@ import com.squareup.okhttp.internal.Internal;
import com.squareup.okhttp.internal.huc.HttpURLConnectionImpl; import com.squareup.okhttp.internal.huc.HttpURLConnectionImpl;
import com.squareup.okhttp.internal.huc.HttpsURLConnectionImpl; import com.squareup.okhttp.internal.huc.HttpsURLConnectionImpl;
import javax.net.SocketFactory;
import javax.net.ssl.HostnameVerifier;
import javax.net.ssl.HttpsURLConnection;
import java.io.BufferedInputStream; import java.io.BufferedInputStream;
import java.io.BufferedOutputStream; import java.io.BufferedOutputStream;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
@@ -53,9 +55,6 @@ import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import javax.net.SocketFactory;
import javax.net.ssl.HostnameVerifier;
import javax.net.ssl.HttpsURLConnection;
/** /**
* MMS HTTP client for sending and downloading MMS messages * MMS HTTP client for sending and downloading MMS messages
@@ -20,15 +20,13 @@ import android.content.Context;
import android.net.ConnectivityManager; import android.net.ConnectivityManager;
import android.net.Network; import android.net.Network;
import android.net.NetworkCapabilities; import android.net.NetworkCapabilities;
import android.net.NetworkRequest;
import android.net.NetworkInfo; import android.net.NetworkInfo;
import android.net.NetworkRequest;
import android.net.SSLCertificateSocketFactory; import android.net.SSLCertificateSocketFactory;
import android.os.Build; import android.os.Build;
import android.os.SystemClock; import android.os.SystemClock;
import com.klinker.android.logger.Log;
import com.android.mms.service_alt.exception.MmsNetworkException; import com.android.mms.service_alt.exception.MmsNetworkException;
import com.klinker.android.logger.Log;
import com.squareup.okhttp.ConnectionPool; import com.squareup.okhttp.ConnectionPool;
import java.net.InetAddress; import java.net.InetAddress;
@@ -30,11 +30,10 @@ import android.provider.Settings;
import android.service.carrier.CarrierMessagingService; import android.service.carrier.CarrierMessagingService;
import android.telephony.SmsManager; import android.telephony.SmsManager;
import android.telephony.TelephonyManager; import android.telephony.TelephonyManager;
import com.klinker.android.logger.Log;
import com.klinker.android.send_message.Utils;
import com.android.mms.service_alt.exception.ApnException; import com.android.mms.service_alt.exception.ApnException;
import com.android.mms.service_alt.exception.MmsHttpException; import com.android.mms.service_alt.exception.MmsHttpException;
import com.klinker.android.logger.Log;
import com.klinker.android.send_message.Utils;
/** /**
* Base class for MMS requests. This has the common logic of sending/downloading MMS. * Base class for MMS requests. This has the common logic of sending/downloading MMS.
@@ -23,16 +23,11 @@ import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.net.Uri; import android.net.Uri;
import android.os.Binder; import android.os.Binder;
import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.provider.Telephony; import android.provider.Telephony;
import android.telephony.SmsManager; import android.telephony.SmsManager;
import android.text.TextUtils; import android.text.TextUtils;
import com.klinker.android.logger.Log;
import com.android.mms.service_alt.exception.MmsHttpException; 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.GenericPdu;
import com.google.android.mms.pdu_alt.PduHeaders; import com.google.android.mms.pdu_alt.PduHeaders;
import com.google.android.mms.pdu_alt.PduParser; import com.google.android.mms.pdu_alt.PduParser;
@@ -40,6 +35,7 @@ import com.google.android.mms.pdu_alt.PduPersister;
import com.google.android.mms.pdu_alt.SendConf; import com.google.android.mms.pdu_alt.SendConf;
import com.google.android.mms.pdu_alt.SendReq; import com.google.android.mms.pdu_alt.SendReq;
import com.google.android.mms.util_alt.SqliteWrapper; import com.google.android.mms.util_alt.SqliteWrapper;
import com.klinker.android.logger.Log;
/** /**
* Request to send an MMS * Request to send an MMS
@@ -7,7 +7,6 @@ import android.database.sqlite.SQLiteException;
import android.os.Build; import android.os.Build;
import android.provider.Telephony; import android.provider.Telephony;
import android.util.Log; import android.util.Log;
import com.google.android.mms.util_alt.SqliteWrapper; import com.google.android.mms.util_alt.SqliteWrapper;
class SubscriptionIdChecker { class SubscriptionIdChecker {
@@ -16,10 +16,9 @@
package com.android.mms.transaction; package com.android.mms.transaction;
import com.android.mms.logs.LogTag;
import android.content.Context; import android.content.Context;
import android.util.Config; import android.util.Config;
import com.android.mms.logs.LogTag;
import com.klinker.android.logger.Log; import com.klinker.android.logger.Log;
/** /**
@@ -16,13 +16,14 @@
package com.android.mms.transaction; package com.android.mms.transaction;
import java.io.DataInputStream; import android.content.Context;
import java.io.IOException; import android.net.http.AndroidHttpClient;
import java.net.SocketException; import android.telephony.TelephonyManager;
import java.net.URI; import android.text.TextUtils;
import java.net.URISyntaxException; import android.util.Config;
import java.util.Locale; import com.android.mms.MmsConfig;
import com.android.mms.logs.LogTag;
import com.klinker.android.logger.Log;
import org.apache.http.HttpEntity; import org.apache.http.HttpEntity;
import org.apache.http.HttpHost; import org.apache.http.HttpHost;
import org.apache.http.HttpRequest; import org.apache.http.HttpRequest;
@@ -35,15 +36,12 @@ import org.apache.http.params.HttpConnectionParams;
import org.apache.http.params.HttpParams; import org.apache.http.params.HttpParams;
import org.apache.http.params.HttpProtocolParams; import org.apache.http.params.HttpProtocolParams;
import android.content.Context; import java.io.DataInputStream;
import android.net.http.AndroidHttpClient; import java.io.IOException;
import android.telephony.TelephonyManager; import java.net.SocketException;
import android.text.TextUtils; import java.net.URI;
import android.util.Config; import java.net.URISyntaxException;
import com.klinker.android.logger.Log; import java.util.Locale;
import com.android.mms.logs.LogTag;
import com.android.mms.MmsConfig;
public class HttpUtils { public class HttpUtils {
private static final String TAG = LogTag.TRANSACTION; private static final String TAG = LogTag.TRANSACTION;
@@ -27,9 +27,8 @@ import android.net.Uri;
import android.provider.Telephony.Sms; import android.provider.Telephony.Sms;
import android.provider.Telephony.Sms.Inbox; import android.provider.Telephony.Sms.Inbox;
import android.telephony.SmsMessage; import android.telephony.SmsMessage;
import com.klinker.android.logger.Log;
import com.android.mms.logs.LogTag; import com.android.mms.logs.LogTag;
import com.klinker.android.logger.Log;
/** /**
* Service that gets started by the MessageStatusReceiver when a message status report is * Service that gets started by the MessageStatusReceiver when a message status report is
@@ -26,8 +26,6 @@ import android.preference.PreferenceManager;
import android.provider.Telephony.Mms; import android.provider.Telephony.Mms;
import android.provider.Telephony.MmsSms; import android.provider.Telephony.MmsSms;
import android.provider.Telephony.MmsSms.PendingMessages; import android.provider.Telephony.MmsSms.PendingMessages;
import com.klinker.android.logger.Log;
import com.android.mms.logs.LogTag; import com.android.mms.logs.LogTag;
import com.android.mms.util.SendingProgressTokenManager; import com.android.mms.util.SendingProgressTokenManager;
import com.google.android.mms.InvalidHeaderValueException; import com.google.android.mms.InvalidHeaderValueException;
@@ -39,6 +37,7 @@ import com.google.android.mms.pdu_alt.PduPersister;
import com.google.android.mms.pdu_alt.ReadRecInd; import com.google.android.mms.pdu_alt.ReadRecInd;
import com.google.android.mms.pdu_alt.SendReq; import com.google.android.mms.pdu_alt.SendReq;
import com.google.android.mms.util_alt.SqliteWrapper; import com.google.android.mms.util_alt.SqliteWrapper;
import com.klinker.android.logger.Log;
public class MmsMessageSender implements MessageSender { public class MmsMessageSender implements MessageSender {
private static final String TAG = LogTag.TAG; private static final String TAG = LogTag.TAG;
@@ -15,11 +15,10 @@
*/ */
package com.android.mms.transaction; package com.android.mms.transaction;
import com.android.mms.logs.LogTag;
import android.content.BroadcastReceiver; import android.content.BroadcastReceiver;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import com.android.mms.logs.LogTag;
import com.klinker.android.logger.Log; import com.klinker.android.logger.Log;
/** /**
@@ -22,11 +22,9 @@ import android.content.Intent;
import android.net.ConnectivityManager; import android.net.ConnectivityManager;
import android.net.NetworkInfo; import android.net.NetworkInfo;
import android.net.Uri; import android.net.Uri;
import android.os.Build;
import android.provider.Telephony.Mms; import android.provider.Telephony.Mms;
import com.klinker.android.logger.Log;
import com.android.mms.logs.LogTag; import com.android.mms.logs.LogTag;
import com.klinker.android.logger.Log;
import com.klinker.android.send_message.Utils; import com.klinker.android.send_message.Utils;
/** /**
@@ -28,9 +28,8 @@ import android.provider.Telephony.Mms;
import android.provider.Telephony.Mms.Inbox; import android.provider.Telephony.Mms.Inbox;
import android.provider.Telephony.Threads; import android.provider.Telephony.Threads;
import android.telephony.TelephonyManager; import android.telephony.TelephonyManager;
import com.android.mms.logs.LogTag;
import com.android.mms.MmsConfig; import com.android.mms.MmsConfig;
import com.android.mms.logs.LogTag;
import com.android.mms.util.DownloadManager; import com.android.mms.util.DownloadManager;
import com.google.android.mms.MmsException; import com.google.android.mms.MmsException;
import com.google.android.mms.pdu_alt.GenericPdu; import com.google.android.mms.pdu_alt.GenericPdu;
@@ -19,9 +19,7 @@ package com.android.mms.transaction;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import com.klinker.android.send_message.BroadcastUtils; import com.klinker.android.send_message.BroadcastUtils;
import org.apache.http.entity.ByteArrayEntity; import org.apache.http.entity.ByteArrayEntity;
import java.io.IOException; import java.io.IOException;
@@ -16,21 +16,20 @@
package com.android.mms.transaction; package com.android.mms.transaction;
import java.io.IOException;
import android.content.Context; import android.content.Context;
import android.net.Uri; import android.net.Uri;
import android.provider.Telephony.Mms.Sent; import android.provider.Telephony.Mms.Sent;
import com.klinker.android.logger.Log;
import com.android.mms.logs.LogTag; import com.android.mms.logs.LogTag;
import com.google.android.mms.MmsException; import com.google.android.mms.MmsException;
import com.google.android.mms.pdu_alt.EncodedStringValue; import com.google.android.mms.pdu_alt.EncodedStringValue;
import com.google.android.mms.pdu_alt.PduComposer; import com.google.android.mms.pdu_alt.PduComposer;
import com.google.android.mms.pdu_alt.PduPersister; import com.google.android.mms.pdu_alt.PduPersister;
import com.google.android.mms.pdu_alt.ReadRecInd; import com.google.android.mms.pdu_alt.ReadRecInd;
import com.klinker.android.logger.Log;
import com.klinker.android.send_message.Utils; import com.klinker.android.send_message.Utils;
import java.io.IOException;
/** /**
* The ReadRecTransaction is responsible for sending read report * The ReadRecTransaction is responsible for sending read report
* notifications (M-read-rec.ind) to clients that have requested them. * notifications (M-read-rec.ind) to clients that have requested them.
@@ -31,7 +31,6 @@ import android.net.Uri;
import android.provider.Telephony.Mms; import android.provider.Telephony.Mms;
import android.provider.Telephony.MmsSms; import android.provider.Telephony.MmsSms;
import android.provider.Telephony.MmsSms.PendingMessages; import android.provider.Telephony.MmsSms.PendingMessages;
import com.android.mms.logs.LogTag; import com.android.mms.logs.LogTag;
import com.android.mms.util.DownloadManager; import com.android.mms.util.DownloadManager;
import com.google.android.mms.pdu_alt.PduHeaders; import com.google.android.mms.pdu_alt.PduHeaders;
@@ -25,7 +25,6 @@ import android.net.Uri;
import android.provider.Telephony.Mms; import android.provider.Telephony.Mms;
import android.provider.Telephony.Mms.Sent; import android.provider.Telephony.Mms.Sent;
import android.text.TextUtils; import android.text.TextUtils;
import com.android.mms.logs.LogTag; import com.android.mms.logs.LogTag;
import com.android.mms.util.RateController; import com.android.mms.util.RateController;
import com.android.mms.util.SendingProgressTokenManager; import com.android.mms.util.SendingProgressTokenManager;
@@ -16,19 +16,15 @@
package com.android.mms.transaction; package com.android.mms.transaction;
import java.io.IOException;
import java.net.InetAddress;
import java.net.UnknownHostException;
import android.content.Context; import android.content.Context;
import android.net.ConnectivityManager; import android.net.ConnectivityManager;
import android.net.NetworkInfo; import android.net.NetworkInfo;
import android.net.Uri;
import com.android.mms.util.SendingProgressTokenManager; import com.android.mms.util.SendingProgressTokenManager;
import com.google.android.mms.MmsException; import com.google.android.mms.MmsException;
import com.klinker.android.send_message.Utils; import com.klinker.android.send_message.Utils;
import java.io.IOException;
/** /**
* Transaction is an abstract class for notification transaction, send transaction * Transaction is an abstract class for notification transaction, send transaction
* and other transactions described in MMS spec. * and other transactions described in MMS spec.
@@ -35,18 +35,12 @@ import android.os.IBinder;
import android.os.Looper; import android.os.Looper;
import android.os.Message; import android.os.Message;
import android.os.PowerManager; import android.os.PowerManager;
import android.preference.PreferenceManager;
import android.provider.Telephony.Mms; import android.provider.Telephony.Mms;
import android.provider.Telephony.MmsSms; import android.provider.Telephony.MmsSms;
import android.provider.Telephony.MmsSms.PendingMessages; import android.provider.Telephony.MmsSms.PendingMessages;
import android.text.TextUtils; import android.text.TextUtils;
import android.widget.Toast; import android.widget.Toast;
import com.android.mms.logs.LogTag; import com.android.mms.logs.LogTag;
import com.android.mms.service_alt.DownloadRequest;
import com.android.mms.service_alt.MmsNetworkManager;
import com.android.mms.service_alt.MmsRequestManager;
import com.android.mms.util.DownloadManager;
import com.android.mms.util.RateController; import com.android.mms.util.RateController;
import com.google.android.mms.MmsException; import com.google.android.mms.MmsException;
import com.google.android.mms.pdu_alt.GenericPdu; import com.google.android.mms.pdu_alt.GenericPdu;
@@ -20,14 +20,12 @@ import android.content.Context;
import android.net.NetworkUtilsHelper; import android.net.NetworkUtilsHelper;
import android.provider.Telephony; import android.provider.Telephony;
import android.text.TextUtils; import android.text.TextUtils;
import com.klinker.android.logger.Log;
import com.android.mms.MmsConfig; import com.android.mms.MmsConfig;
import com.android.mms.logs.LogTag;
import com.klinker.android.logger.Log;
import com.klinker.android.send_message.Transaction; import com.klinker.android.send_message.Transaction;
import com.klinker.android.send_message.Utils; import com.klinker.android.send_message.Utils;
import com.android.mms.logs.LogTag;
/** /**
* Container of transaction settings. Instances of this class are contained * Container of transaction settings. Instances of this class are contained
* within Transaction instances to allow overriding of the default APN * within Transaction instances to allow overriding of the default APN
@@ -26,17 +26,15 @@ import android.os.Handler;
import android.os.Looper; import android.os.Looper;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.provider.Telephony.Mms; import android.provider.Telephony.Mms;
import com.android.mms.logs.LogTag;
import com.klinker.android.logger.Log;
import android.widget.Toast; import android.widget.Toast;
import com.android.internal.telephony.TelephonyProperties; import com.android.internal.telephony.TelephonyProperties;
import com.android.mms.logs.LogTag;
import com.android.mms.service_alt.SystemPropertiesProxy; import com.android.mms.service_alt.SystemPropertiesProxy;
import com.google.android.mms.MmsException; import com.google.android.mms.MmsException;
import com.google.android.mms.pdu_alt.EncodedStringValue; import com.google.android.mms.pdu_alt.EncodedStringValue;
import com.google.android.mms.pdu_alt.NotificationInd; import com.google.android.mms.pdu_alt.NotificationInd;
import com.google.android.mms.pdu_alt.PduPersister; import com.google.android.mms.pdu_alt.PduPersister;
import com.klinker.android.logger.Log;
import com.klinker.android.send_message.R; import com.klinker.android.send_message.R;
public class DownloadManager { public class DownloadManager {
@@ -24,7 +24,6 @@ import android.content.IntentFilter;
import android.database.Cursor; import android.database.Cursor;
import android.database.sqlite.SqliteWrapper; import android.database.sqlite.SqliteWrapper;
import android.provider.Telephony.Mms.Rate; import android.provider.Telephony.Mms.Rate;
import com.android.mms.logs.LogTag; import com.android.mms.logs.LogTag;
import com.klinker.android.logger.Log; import com.klinker.android.logger.Log;
@@ -16,11 +16,11 @@
package com.android.mms.util; package com.android.mms.util;
import java.util.HashMap;
import com.android.mms.logs.LogTag; import com.android.mms.logs.LogTag;
import com.klinker.android.logger.Log; import com.klinker.android.logger.Log;
import java.util.HashMap;
public class SendingProgressTokenManager { public class SendingProgressTokenManager {
private static final String TAG = LogTag.TAG; private static final String TAG = LogTag.TAG;
private static final boolean DEBUG = false; private static final boolean DEBUG = false;
@@ -16,7 +16,11 @@
package com.google.android.collect; package com.google.android.collect;
import java.util.*; import java.util.Collections;
import java.util.EnumSet;
import java.util.HashSet;
import java.util.SortedSet;
import java.util.TreeSet;
/** /**
* Provides static methods for creating mutable {@code Set} instances easily and * Provides static methods for creating mutable {@code Set} instances easily and
@@ -19,7 +19,6 @@ package com.google.android.mms.pdu_alt;
import com.android.mms.util.ExternalLogger; import com.android.mms.util.ExternalLogger;
import com.google.android.mms.ContentType; import com.google.android.mms.ContentType;
import com.google.android.mms.InvalidHeaderValueException; import com.google.android.mms.InvalidHeaderValueException;
import com.klinker.android.logger.Log; import com.klinker.android.logger.Log;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
@@ -16,9 +16,8 @@
package com.google.android.mms.pdu_alt; package com.google.android.mms.pdu_alt;
import com.klinker.android.logger.Log;
import com.google.android.mms.InvalidHeaderValueException; import com.google.android.mms.InvalidHeaderValueException;
import com.klinker.android.logger.Log;
public class SendReq extends MultimediaMessagePdu { public class SendReq extends MultimediaMessagePdu {
private static final String TAG = "SendReq"; private static final String TAG = "SendReq";
@@ -1,11 +1,15 @@
package com.google.android.mms.smil; package com.google.android.mms.smil;
import com.klinker.android.logger.Log;
import com.android.mms.dom.smil.SmilDocumentImpl; import com.android.mms.dom.smil.SmilDocumentImpl;
import com.google.android.mms.ContentType; import com.google.android.mms.ContentType;
import com.google.android.mms.pdu_alt.PduBody; import com.google.android.mms.pdu_alt.PduBody;
import com.google.android.mms.pdu_alt.PduPart; import com.google.android.mms.pdu_alt.PduPart;
import org.w3c.dom.smil.*; import com.klinker.android.logger.Log;
import org.w3c.dom.smil.SMILDocument;
import org.w3c.dom.smil.SMILElement;
import org.w3c.dom.smil.SMILLayoutElement;
import org.w3c.dom.smil.SMILMediaElement;
import org.w3c.dom.smil.SMILParElement;
public class SmilHelper { public class SmilHelper {
@@ -18,8 +18,8 @@ package com.google.android.mms.util_alt;
import android.content.Context; import android.content.Context;
import android.drm.DrmConvertedStatus; import android.drm.DrmConvertedStatus;
import android.drm.DrmManagerClient; import android.drm.DrmManagerClient;
import com.klinker.android.logger.Log;
import android.provider.Downloads; import android.provider.Downloads;
import com.klinker.android.logger.Log;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.IOException; import java.io.IOException;
@@ -23,8 +23,8 @@ import android.content.Context;
import android.database.Cursor; import android.database.Cursor;
import android.database.sqlite.SQLiteException; import android.database.sqlite.SQLiteException;
import android.net.Uri; import android.net.Uri;
import com.klinker.android.logger.Log;
import android.widget.Toast; import android.widget.Toast;
import com.klinker.android.logger.Log;
public final class SqliteWrapper { public final class SqliteWrapper {
private static final String TAG = "SqliteWrapper"; private static final String TAG = "SqliteWrapper";
@@ -14,14 +14,12 @@ import android.telephony.SmsManager;
import android.telephony.SmsMessage; import android.telephony.SmsMessage;
import android.telephony.TelephonyManager; import android.telephony.TelephonyManager;
import android.text.TextUtils; import android.text.TextUtils;
import com.android.mms.service_alt.MmsNetworkManager; import com.android.mms.service_alt.MmsNetworkManager;
import com.android.mms.service_alt.exception.MmsNetworkException; import com.android.mms.service_alt.exception.MmsNetworkException;
import com.google.android.mms.util_alt.SqliteWrapper; import com.google.android.mms.util_alt.SqliteWrapper;
import com.klinker.android.logger.Log; import com.klinker.android.logger.Log;
import java.io.IOException; import java.io.IOException;
import java.lang.reflect.Field;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.net.InetAddress; import java.net.InetAddress;
import java.net.UnknownHostException; import java.net.UnknownHostException;