From fde44145e86575e0b9e5efee952ab3f04c6ccda0 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sat, 13 Jan 2018 01:40:26 -0500 Subject: [PATCH] Clean up some lint issues in android-smsmms module --- .../android/send_message/ApnUtils.java | 380 ------------------ .../klinker/android/send_message/Message.java | 10 +- .../send_message/MmsReceivedReceiver.java | 16 +- .../send_message/MmsReceivedService.java | 10 +- .../android/send_message/Settings.java | 2 - .../android/send_message/Transaction.java | 218 ++++------ .../klinker/android/send_message/Utils.java | 65 +-- 7 files changed, 99 insertions(+), 602 deletions(-) delete mode 100755 android-smsmms/src/main/java/com/klinker/android/send_message/ApnUtils.java diff --git a/android-smsmms/src/main/java/com/klinker/android/send_message/ApnUtils.java b/android-smsmms/src/main/java/com/klinker/android/send_message/ApnUtils.java deleted file mode 100755 index d517b093..00000000 --- a/android-smsmms/src/main/java/com/klinker/android/send_message/ApnUtils.java +++ /dev/null @@ -1,380 +0,0 @@ -package com.klinker.android.send_message; - -import android.app.AlertDialog; -import android.content.Context; -import android.content.DialogInterface; -import android.content.SharedPreferences; -import android.content.res.XmlResourceParser; -import android.os.Build; -import android.preference.PreferenceManager; -import android.telephony.ServiceState; -import android.telephony.TelephonyManager; -import android.telephony.cdma.CdmaCellLocation; -import android.widget.Toast; - -import com.klinker.android.logger.Log; - -import org.xmlpull.v1.XmlPullParser; -import org.xmlpull.v1.XmlPullParserException; - -import java.io.IOException; -import java.util.ArrayList; - -public class ApnUtils { - - private static final String TAG = "ApnUtils"; - - public static void initDefaultApns(final Context context, final OnApnFinishedListener listener) { - loadMmsSettings(context); - final ArrayList apns = loadApns(context); - - if (apns == null || apns.size() == 0) { - Log.v(TAG, "Found no APNs :( Damn CDMA network probably."); - Toast.makeText(context, context.getString(R.string.auto_select_failed), Toast.LENGTH_SHORT).show(); - if (listener != null) { - listener.onFinished(); - } - } else if (apns.size() == 1) { - setApns(context, apns.get(0)); - if (listener != null) { - listener.onFinished(); - } - } else { - if (!PreferenceManager.getDefaultSharedPreferences(context).getBoolean("has_seen_select_apns_warning", false)) { - new AlertDialog.Builder(context) - .setTitle(R.string.auto_select_apn) - .setMessage(R.string.auto_select_multiple_apns) - .setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialogInterface, int num) { - showApnChooser(context, apns, listener); - } - }) - .show(); - PreferenceManager.getDefaultSharedPreferences(context).edit().putBoolean("has_seen_select_apns_warning", true).commit(); - } else { - showApnChooser(context, apns, listener); - } - } - } - - private static void showApnChooser(final Context context, final ArrayList apns, final OnApnFinishedListener listener) { - CharSequence[] items = new CharSequence[apns.size()]; - SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context); - String curMmsc = sharedPrefs.getString("mmsc_url", ""); - String curProxy = sharedPrefs.getString("mms_proxy", ""); - String curPort = sharedPrefs.getString("mms_port", ""); - - int defaultApn = -1; - for (int i = 0; i < items.length; i++) { - APN apn = apns.get(i); - items[i] = (i+1) + ". " + apn.name; - - if (apn.mmsc.equals(curMmsc) && apn.proxy.equals(curProxy) && apn.port.equals(curPort)) { - defaultApn = i; - } - } - - new AlertDialog.Builder(context) - .setSingleChoiceItems(items, defaultApn, new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialogInterface, int i) { - setApns(context, apns.get(i)); - if (listener != null) { - listener.onFinished(); - } - dialogInterface.dismiss(); - } - }) - .setOnCancelListener(new DialogInterface.OnCancelListener() { - @Override - public void onCancel(DialogInterface dialogInterface) { - if (listener != null) { - listener.onFinished(); - } - } - }) - .show(); - } - - public interface OnApnFinishedListener { - public abstract void onFinished(); - } - - private static void loadMmsSettings(Context context) { - XmlResourceParser parser = context.getResources().getXml(R.xml.mms_config); - String maxMessageSize = 1000000 + ""; - int maxImageHeight = 800; - int maxImageWidth = 800; - String userAgent = "Android Messaging"; - String uaProfUrl = "http://www.gstatic.com/android/hangouts/hangouts_mms_ua_profile.xml"; - - try { - beginDocument(parser, "mms_config"); - - while (true) { - nextElement(parser); - String tag = parser.getName(); - if (tag == null) { - break; - } - String name = parser.getAttributeName(0); - String value = parser.getAttributeValue(0); - String text = null; - if (parser.next() == XmlPullParser.TEXT) { - text = parser.getText(); - } - - Log.v(TAG, "tag: " + tag + " value: " + value + " - " + - text); - if ("name".equalsIgnoreCase(name)) { - if ("int".equals(tag)) { - // int config tags go here - if ("maxMessageSize".equalsIgnoreCase(value)) { - maxMessageSize = text; - } else if ("maxImageHeight".equalsIgnoreCase(value)) { - maxImageHeight = Integer.parseInt(text); - } else if ("maxImageWidth".equalsIgnoreCase(value)) { - maxImageWidth = Integer.parseInt(text); - } - } else if ("string".equals(tag)) { - // string config tags go here - if ("userAgent".equalsIgnoreCase(value)) { - userAgent = text; - } else if ("uaProfUrl".equalsIgnoreCase(value)) { - uaProfUrl = text; - } - } - } - } - } catch (XmlPullParserException e) { - Log.e(TAG, "loadMmsSettings caught ", e); - } catch (NumberFormatException e) { - Log.e(TAG, "loadMmsSettings caught ", e); - } catch (IOException e) { - Log.e(TAG, "loadMmsSettings caught ", e); - } finally { - parser.close(); - } - - String errorStr = null; - - if (errorStr != null) { - String err = - String.format("MmsConfig.loadMmsSettings mms_config.xml missing %s setting", - errorStr); - Log.e(TAG, err); - } - - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { - final TelephonyManager telephonyManager = - (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE); - userAgent = telephonyManager.getMmsUserAgent(); - uaProfUrl = telephonyManager.getMmsUAProfUrl(); - } - - PreferenceManager.getDefaultSharedPreferences(context) - .edit() - .putInt("mms_max_width", maxImageWidth) - .putInt("mms_max_height", maxImageHeight) - .putString("mms_max_size", maxMessageSize) - .putString("mms_agent", userAgent) - .putString("mms_user_agent_profile_url", uaProfUrl) - .commit(); - } - - private static ArrayList loadApns(Context context) { - XmlResourceParser parser = context.getResources().getXml(R.xml.apns); - ArrayList apns = new ArrayList(); - String mmsc = "", proxy = "", port = "", carrier = ""; - - int mcc = -1, mnc = -1; - - TelephonyManager manager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE); - String networkOperator = manager.getNetworkOperator(); - - if (isValidNetworkOperator(networkOperator)) { - mcc = Integer.parseInt(networkOperator.substring(0, 3)); - String s = networkOperator.substring(3); - try { - mnc = Integer.parseInt(s.replaceFirst("^0{1,2}", "")); - } catch (Exception e) { - mnc = -1; - } - } else { - mcc = context.getResources().getConfiguration().mcc; - mnc = context.getResources().getConfiguration().mnc; - } - - try { - if (mcc == -1) { - mcc = Integer.parseInt(new ServiceState().getOperatorNumeric().substring(0, 3)); - } - - if (mnc == -1) { - TelephonyManager tm = (TelephonyManager) context.getSystemService - (Context.TELEPHONY_SERVICE); - mnc = ((CdmaCellLocation) tm.getCellLocation()).getSystemId(); - } - } catch (Exception e) { - - } - - if (mcc == -1 || mnc == -1) { - Log.v(TAG, "couldn't find both mcc and mnc. mcc = " + mcc + ", mnc = " + mnc); - return null; - } - - Log.v(TAG, "mcc: " + mcc + " mnc: " + mnc); - - try { - beginDocument(parser, "apns"); - - while (true) { - nextElement(parser); - String tag = parser.getName(); - if (tag == null) { - break; - } - - boolean mccCorrect = false, mncCorrect = false; - for (int i = 0; i < parser.getAttributeCount(); i++) { - try { - String name = parser.getAttributeName(i); - int value = Integer.parseInt(parser.getAttributeValue(i)); - if ("mcc".equals(name) && mcc == value) { - mccCorrect = true; - } else if ("mnc".equals(name) && mnc == value) { - mncCorrect = true; - } - } catch (Exception e) { - // cast exception probably - } - } - - if (mccCorrect && mncCorrect) { - // parse the rest of the apn - for (int i = 0; i < parser.getAttributeCount(); i++) { - String name = parser.getAttributeName(i); - String value = parser.getAttributeValue(i); - if ("type".equals(name)) { - if (!value.contains("mms")) { - mmsc = ""; - proxy = ""; - port = ""; - break; - } - } else if ("mmsc".equals(name)) { - mmsc = value; - } else if ("mmsproxy".equals(name)) { - proxy = value; - } else if ("mmsport".equals(name)) { - port = value; - } else if ("carrier".equals(name)) { - carrier = value; - } else if ("port".equals(name) && port.equals("")) { - port = value; - } - } - - if (!mmsc.equals("")) { - APN apn = new APN(); - apn.name = carrier; - apn.mmsc = mmsc; - apn.proxy = proxy; - apn.port = port; - - boolean contains = false; - for (int i = 0; i < apns.size(); i++) { - APN current = apns.get(i); - - if (current.mmsc.equals(apn.mmsc) && current.port.equals(apn.port) && current.proxy.equals(apn.proxy)) { - contains = true; - break; - } - } - - if (!contains) { - apns.add(apn); - } - } - } - } - } catch (XmlPullParserException e) { - Log.e(TAG, "loadApns caught ", e); - } catch (NumberFormatException e) { - Log.e(TAG, "loadApns caught ", e); - } catch (IOException e) { - Log.e(TAG, "loadApns caught ", e); - } finally { - parser.close(); - } - - Log.v(TAG, "MMSC: " + mmsc + ", MMS Proxy: " + proxy + ", MMS Port: " + port); - - String errorStr = null; - - if (errorStr != null) { - String err = - String.format("MmsConfig.loadMmsSettings mms_config.xml missing %s setting", - errorStr); - Log.e(TAG, err); - } - - return apns; - } - - /** - * Checks if the given network operator is valid, i.e. it's not null, empty or contains "null" - * - * @param networkOperator - * The network operator to be checked - * - * @return True if is a valid operator - */ - private static boolean isValidNetworkOperator(String networkOperator) { - return networkOperator != null && !networkOperator.isEmpty() && - !networkOperator.contains("null"); - } - - private static void setApns(Context context, APN apn) { - PreferenceManager.getDefaultSharedPreferences(context) - .edit() - .putString("mmsc_url", apn.mmsc) - .putString("mms_proxy", apn.proxy) - .putString("mms_port", apn.port) - .commit(); - } - - private static void beginDocument(XmlPullParser parser, String firstElementName) throws XmlPullParserException, IOException { - int type; - while ((type=parser.next()) != parser.START_TAG - && type != parser.END_DOCUMENT) { - ; - } - - if (type != parser.START_TAG) { - throw new XmlPullParserException("No start tag found"); - } - - if (!parser.getName().equals(firstElementName)) { - throw new XmlPullParserException("Unexpected start tag: found " + parser.getName() + - ", expected " + firstElementName); - } - } - - private static void nextElement(XmlPullParser parser) throws XmlPullParserException, IOException { - int type; - while ((type=parser.next()) != parser.START_TAG - && type != parser.END_DOCUMENT) { - ; - } - } - - private static class APN { - public String name; - public String mmsc; - public String proxy; - public String port; - } -} diff --git a/android-smsmms/src/main/java/com/klinker/android/send_message/Message.java b/android-smsmms/src/main/java/com/klinker/android/send_message/Message.java index dce093d6..383987f9 100755 --- a/android-smsmms/src/main/java/com/klinker/android/send_message/Message.java +++ b/android-smsmms/src/main/java/com/klinker/android/send_message/Message.java @@ -58,7 +58,7 @@ public class Message { private String[] addresses; private Bitmap[] images; private String[] imageNames; - private List parts = new ArrayList(); + private List parts = new ArrayList<>(); private boolean save; private int delay; @@ -411,9 +411,7 @@ public class Message { this.addresses = new String[temp.length + 1]; - for (int i = 0; i < temp.length; i++) { - this.addresses[i] = temp[i]; - } + System.arraycopy(temp, 0, this.addresses, 0, temp.length); this.addresses[temp.length] = address; } @@ -432,9 +430,7 @@ public class Message { this.images = new Bitmap[temp.length + 1]; - for (int i = 0; i < temp.length; i++) { - this.images[i] = temp[i]; - } + System.arraycopy(temp, 0, this.images, 0, temp.length); this.images[temp.length] = image; } diff --git a/android-smsmms/src/main/java/com/klinker/android/send_message/MmsReceivedReceiver.java b/android-smsmms/src/main/java/com/klinker/android/send_message/MmsReceivedReceiver.java index 8ce3109c..2e57fbe5 100755 --- a/android-smsmms/src/main/java/com/klinker/android/send_message/MmsReceivedReceiver.java +++ b/android-smsmms/src/main/java/com/klinker/android/send_message/MmsReceivedReceiver.java @@ -24,14 +24,12 @@ import android.os.AsyncTask; import android.provider.Telephony; import android.telephony.SmsManager; import android.util.Log; - import com.android.mms.service_alt.DownloadRequest; import com.android.mms.service_alt.MmsConfig; import com.android.mms.transaction.DownloadManager; 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.google.android.mms.pdu_alt.EncodedStringValue; import com.google.android.mms.pdu_alt.GenericPdu; @@ -263,7 +261,7 @@ public class MmsReceivedReceiver extends BroadcastReceiver { @Override protected Void doInBackground(Void... params) { // Create the M-NotifyResp.ind - NotifyRespInd notifyRespInd = null; + NotifyRespInd notifyRespInd; try { notifyRespInd = new NotifyRespInd( PduHeaders.CURRENT_MMS_VERSION, @@ -276,9 +274,7 @@ public class MmsReceivedReceiver extends BroadcastReceiver { } else { sendPdu(new PduComposer(mContext, notifyRespInd).make()); } - } catch (MmsException e) { - Log.e(TAG, "error", e); - } catch (IOException e) { + } catch (MmsException | IOException e) { Log.e(TAG, "error", e); } return null; @@ -302,7 +298,7 @@ public class MmsReceivedReceiver extends BroadcastReceiver { if (tranId != null) { Log.v(TAG, "sending ACK to MMSC: " + mTransactionSettings.getMmscUrl()); // Create M-Acknowledge.ind - com.google.android.mms.pdu_alt.AcknowledgeInd acknowledgeInd = null; + com.google.android.mms.pdu_alt.AcknowledgeInd acknowledgeInd; try { acknowledgeInd = new com.google.android.mms.pdu_alt.AcknowledgeInd( @@ -318,11 +314,7 @@ public class MmsReceivedReceiver extends BroadcastReceiver { } else { sendPdu(new PduComposer(mContext, acknowledgeInd).make()); } - } catch (InvalidHeaderValueException e) { - Log.e(TAG, "error", e); - } catch (MmsException e) { - Log.e(TAG, "error", e); - } catch (IOException e) { + } catch (IOException | MmsException e) { Log.e(TAG, "error", e); } } diff --git a/android-smsmms/src/main/java/com/klinker/android/send_message/MmsReceivedService.java b/android-smsmms/src/main/java/com/klinker/android/send_message/MmsReceivedService.java index 956f5323..ab4111ef 100755 --- a/android-smsmms/src/main/java/com/klinker/android/send_message/MmsReceivedService.java +++ b/android-smsmms/src/main/java/com/klinker/android/send_message/MmsReceivedService.java @@ -5,10 +5,8 @@ import android.app.IntentService; import android.content.Context; import android.content.Intent; import android.net.Uri; -import android.os.Build; import android.provider.Telephony; import android.telephony.SmsManager; - import com.android.mms.service_alt.DownloadRequest; import com.android.mms.service_alt.MmsConfig; import com.android.mms.transaction.DownloadManager; @@ -99,10 +97,6 @@ public class MmsReceivedService extends IntentService { } private static void handleHttpError(Context context, Intent intent) { - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) { - return; - } - final int httpError = intent.getIntExtra(SmsManager.EXTRA_MMS_HTTP_STATUS, 0); if (httpError == 404 || httpError == 400) { @@ -220,7 +214,7 @@ public class MmsReceivedService extends IntentService { @Override public void run() throws IOException { // Create the M-NotifyResp.ind - NotifyRespInd notifyRespInd = null; + NotifyRespInd notifyRespInd; try { notifyRespInd = new NotifyRespInd( PduHeaders.CURRENT_MMS_VERSION, @@ -255,7 +249,7 @@ public class MmsReceivedService extends IntentService { byte[] tranId = mRetrieveConf.getTransactionId(); if (tranId != null) { // Create M-Acknowledge.ind - com.google.android.mms.pdu_alt.AcknowledgeInd acknowledgeInd = null; + com.google.android.mms.pdu_alt.AcknowledgeInd acknowledgeInd; try { acknowledgeInd = new com.google.android.mms.pdu_alt.AcknowledgeInd( PduHeaders.CURRENT_MMS_VERSION, tranId); diff --git a/android-smsmms/src/main/java/com/klinker/android/send_message/Settings.java b/android-smsmms/src/main/java/com/klinker/android/send_message/Settings.java index 83f2358f..95637cba 100755 --- a/android-smsmms/src/main/java/com/klinker/android/send_message/Settings.java +++ b/android-smsmms/src/main/java/com/klinker/android/send_message/Settings.java @@ -16,9 +16,7 @@ package com.klinker.android.send_message; -import android.net.wifi.WifiInfo; import android.os.Build; - import com.klinker.android.logger.Log; /** diff --git a/android-smsmms/src/main/java/com/klinker/android/send_message/Transaction.java b/android-smsmms/src/main/java/com/klinker/android/send_message/Transaction.java index 93ce1c13..45efda4c 100755 --- a/android-smsmms/src/main/java/com/klinker/android/send_message/Transaction.java +++ b/android-smsmms/src/main/java/com/klinker/android/send_message/Transaction.java @@ -18,31 +18,40 @@ package com.klinker.android.send_message; import android.app.Activity; import android.app.PendingIntent; -import android.content.*; +import android.content.ContentResolver; +import android.content.ContentValues; +import android.content.Context; +import android.content.Intent; import android.database.Cursor; import android.graphics.Bitmap; import android.net.Uri; -import android.os.Build; import android.os.Bundle; import android.os.Looper; import android.telephony.SmsManager; import android.telephony.SmsMessage; import android.text.TextUtils; - +import android.widget.Toast; import com.android.mms.MmsConfig; +import com.android.mms.dom.smil.parser.SmilXmlSerializer; import com.android.mms.service_alt.MmsNetworkManager; import com.android.mms.service_alt.MmsRequestManager; import com.android.mms.service_alt.SendRequest; -import com.klinker.android.logger.Log; -import android.widget.Toast; -import com.android.mms.dom.smil.parser.SmilXmlSerializer; -import com.android.mms.transaction.MmsMessageSender; -import com.android.mms.transaction.ProgressCallbackEntity; import com.android.mms.util.DownloadManager; import com.android.mms.util.RateController; -import com.google.android.mms.*; -import com.google.android.mms.pdu_alt.*; +import com.google.android.mms.ContentType; +import com.google.android.mms.InvalidHeaderValueException; +import com.google.android.mms.MMSPart; +import com.google.android.mms.MmsException; +import com.google.android.mms.pdu_alt.CharacterSets; +import com.google.android.mms.pdu_alt.EncodedStringValue; +import com.google.android.mms.pdu_alt.PduBody; +import com.google.android.mms.pdu_alt.PduComposer; +import com.google.android.mms.pdu_alt.PduHeaders; +import com.google.android.mms.pdu_alt.PduPart; +import com.google.android.mms.pdu_alt.PduPersister; +import com.google.android.mms.pdu_alt.SendReq; import com.google.android.mms.smil.SmilHelper; +import com.klinker.android.logger.Log; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -50,7 +59,13 @@ import java.io.File; import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStream; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Calendar; +import java.util.HashSet; +import java.util.List; +import java.util.Random; +import java.util.Set; /** * Class to process transaction requests for sending @@ -97,7 +112,7 @@ public class Transaction { * @param settings is the settings object to process send requests through */ public Transaction(Context context, Settings settings) { - this.settings = settings; + Transaction.settings = settings; this.context = context; SMS_SENT = context.getPackageName() + SMS_SENT; @@ -140,48 +155,9 @@ public class Transaction { } - /** - * Optional: define a {@link BroadcastReceiver} that will get started when Android notifies us that the SMS has - * been marked as "sent". If you do not define a receiver here, it will look for the .SMS_SENT receiver - * that was defined in the AndroidManifest, as discussed in the README.md. - * - * @param intent the receiver that you want to start when the message gets marked as sent. - */ - public Transaction setExplicitBroadcastForSentSms(Intent intent) { - explicitSentSmsReceiver = intent; - return this; - } - - /** - * Optional: define a {@link BroadcastReceiver} that will get started when Android notifies us that the MMS has - * been marked as "sent". If you do not define a receiver here, it will look for the .MMS_SENT receiver - * that was defined in the AndroidManifest, as discussed in the README.md. - * - * @param intent the receiver that you want to start when the message gets marked as sent. - */ - public Transaction setExplicitBroadcastForSentMms(Intent intent) { - explicitSentMmsReceiver = intent; - return this; - } - - /** - * Optional: define a {@link BroadcastReceiver} that will get started when Android notifies us that the SMS has - * been marked as "delivered". If you do not define a receiver here, it will look for the .SMS_DELIVERED - * receiver that was defined in the AndroidManifest, as discussed in the README.md. - *

- * Providing a receiver here does not guarantee that it will ever get started. If the {@link Settings} - * object does not have delivery reports turned on, this receiver will never get called. - * - * @param intent the receiver that you want to start when the message gets marked as sent. - */ - public Transaction setExplicitBroadcastForDeliveredSms(Intent intent) { - explicitDeliveredSmsReceiver = intent; - return this; - } - private void sendSmsMessage(String text, String[] addresses, long threadId, int delay) { Log.v("send_transaction", "message text: " + text); - Uri messageUri = null; + Uri messageUri; int messageId = 0; if (saveMessage) { Log.v("send_transaction", "saving message"); @@ -191,10 +167,10 @@ public class Transaction { } // save the message for each of the addresses - for (int i = 0; i < addresses.length; i++) { + for (String address : addresses) { Calendar cal = Calendar.getInstance(); ContentValues values = new ContentValues(); - values.put("address", addresses[i]); + values.put("address", address); values.put("body", settings.getStripUnicode() ? StripAccents.stripAccents(text) : text); values.put("date", cal.getTimeInMillis() + ""); values.put("read", 1); @@ -202,7 +178,7 @@ public class Transaction { // attempt to create correct thread id if one is not supplied if (threadId == NO_THREAD_ID || addresses.length > 1) { - threadId = Utils.getOrCreateThreadId(context, addresses[i]); + threadId = Utils.getOrCreateThreadId(context, address); } Log.v("send_transaction", "saving message with thread id: " + threadId); @@ -212,7 +188,7 @@ public class Transaction { Log.v("send_transaction", "inserted to uri: " + messageUri); - Cursor query = context.getContentResolver().query(messageUri, new String[] {"_id"}, null, null, null); + Cursor query = context.getContentResolver().query(messageUri, new String[]{"_id"}, null, null, null); if (query != null && query.moveToFirst()) { messageId = query.getInt(0); query.close(); @@ -245,8 +221,8 @@ public class Transaction { PendingIntent deliveredPI = PendingIntent.getBroadcast( context, messageId, deliveredIntent, PendingIntent.FLAG_UPDATE_CURRENT); - ArrayList sPI = new ArrayList(); - ArrayList dPI = new ArrayList(); + ArrayList sPI = new ArrayList<>(); + ArrayList dPI = new ArrayList<>(); String body = text; @@ -283,8 +259,8 @@ public class Transaction { String[] textToSend = splitByLength(body, length, counter); // send each message part to each recipient attached to message - for (int j = 0; j < textToSend.length; j++) { - ArrayList parts = smsManager.divideMessage(textToSend[j]); + for (String aTextToSend : textToSend) { + ArrayList parts = smsManager.divideMessage(aTextToSend); for (int k = 0; k < parts.size(); k++) { sPI.add(saveMessage ? sentPI : null); @@ -292,7 +268,7 @@ public class Transaction { } Log.v("send_transaction", "sending split message"); - sendDelayedSms(smsManager, addresses[i], parts, sPI, dPI, delay, messageUri); + sendDelayedSms(smsManager, address, parts, sPI, dPI, delay, messageUri); } } else { Log.v("send_transaction", "sending without splitting"); @@ -307,7 +283,7 @@ public class Transaction { if (Utils.isDefaultSmsApp(context)) { try { Log.v("send_transaction", "sent message"); - sendDelayedSms(smsManager, addresses[i], parts, sPI, dPI, delay, messageUri); + sendDelayedSms(smsManager, address, parts, sPI, dPI, delay, messageUri); } catch (Exception e) { // whoops... Log.v("send_transaction", "error sending message"); @@ -321,11 +297,12 @@ public class Transaction { Toast.makeText(context, "Message could not be sent", Toast.LENGTH_LONG).show(); } }); - } catch (Exception f) { } + } catch (Exception f) { + } } } else { // not default app, so just fire it off right away for the hell of it - smsManager.sendMultipartTextMessage(addresses[i], null, parts, sPI, dPI); + smsManager.sendMultipartTextMessage(address, null, parts, sPI, dPI); } } } @@ -368,16 +345,16 @@ public class Transaction { private void sendMmsMessage(String text, String[] addresses, Bitmap[] image, String[] imageNames, List parts, String subject) { // merge the string[] of addresses into a single string so they can be inserted into the database easier - String address = ""; + StringBuilder address = new StringBuilder(); - for (int i = 0; i < addresses.length; i++) { - address += addresses[i] + " "; + for (String address1 : addresses) { + address.append(address1).append(" "); } - address = address.trim(); + address = new StringBuilder(address.toString().trim()); // create the parts to send - ArrayList data = new ArrayList(); + ArrayList data = new ArrayList<>(); for (int i = 0; i < image.length; i++) { // turn bitmap into byte array to be stored @@ -415,70 +392,22 @@ public class Transaction { data.add(part); } - if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.KITKAT) { - MessageInfo info = null; + Log.v(TAG, "using lollipop method for sending sms"); - try { - info = getBytes(context, saveMessage, address.split(" "), - data.toArray(new MMSPart[data.size()]), subject); - MmsMessageSender sender = new MmsMessageSender(context, info.location, info.bytes.length); - sender.sendMessage(info.token); - - IntentFilter filter = new IntentFilter(); - filter.addAction(ProgressCallbackEntity.PROGRESS_STATUS_ACTION); - BroadcastReceiver receiver = new BroadcastReceiver() { - - @Override - public void onReceive(Context context, Intent intent) { - int progress = intent.getIntExtra("progress", -3); - Log.v("sending_mms_library", "progress: " + progress); - - // send progress broadcast to update ui if desired... - Intent progressIntent = new Intent(MMS_PROGRESS); - progressIntent.putExtra("progress", progress); - BroadcastUtils.sendExplicitBroadcast(context, progressIntent, MMS_PROGRESS); - - if (progress == ProgressCallbackEntity.PROGRESS_COMPLETE) { - BroadcastUtils.sendExplicitBroadcast(context, new Intent(), REFRESH); - - try { - context.unregisterReceiver(this); - } catch (Exception e) { - // TODO fix me - // receiver is not registered force close error... hmm. - } - } else if (progress == ProgressCallbackEntity.PROGRESS_ABORT) { - // This seems to get called only after the progress has reached 100 and - // then something else goes wrong, so here we will try and send again - // and see if it works - Log.v("sending_mms_library", "sending aborted for some reason..."); - } - } - - }; - - context.registerReceiver(receiver, filter); - } catch (Throwable e) { - Log.e(TAG, "exception thrown", e); - } + if (settings.getUseSystemSending()) { + Log.v(TAG, "using system method for sending"); + sendMmsThroughSystem(context, subject, data, addresses, explicitSentMmsReceiver); } else { - Log.v(TAG, "using lollipop method for sending sms"); - - if (settings.getUseSystemSending()) { - Log.v(TAG, "using system method for sending"); - sendMmsThroughSystem(context, subject, data, addresses, explicitSentMmsReceiver); - } else { - try { - MessageInfo info = getBytes(context, saveMessage, address.split(" "), - data.toArray(new MMSPart[data.size()]), subject); - MmsRequestManager requestManager = new MmsRequestManager(context, info.bytes); - SendRequest request = new SendRequest(requestManager, Utils.getDefaultSubscriptionId(), - info.location, null, null, null, null); - MmsNetworkManager manager = new MmsNetworkManager(context, Utils.getDefaultSubscriptionId()); - request.execute(context, manager); - } catch (Exception e) { - Log.e(TAG, "error sending mms", e); - } + try { + MessageInfo info = getBytes(context, saveMessage, address.toString().split(" "), + data.toArray(new MMSPart[data.size()]), subject); + MmsRequestManager requestManager = new MmsRequestManager(context, info.bytes); + SendRequest request = new SendRequest(requestManager, Utils.getDefaultSubscriptionId(), + info.location, null, null, null, null); + MmsNetworkManager manager = new MmsNetworkManager(context, Utils.getDefaultSubscriptionId()); + request.execute(context, manager); + } catch (Exception e) { + Log.e(TAG, "error sending mms", e); } } } @@ -489,8 +418,8 @@ public class Transaction { final SendReq sendRequest = new SendReq(); // create send request addresses - for (int i = 0; i < recipients.length; i++) { - final EncodedStringValue[] phoneNumbers = EncodedStringValue.extract(recipients[i]); + for (String recipient : recipients) { + final EncodedStringValue[] phoneNumbers = EncodedStringValue.extract(recipient); if (phoneNumbers != null && phoneNumbers.length > 0) { sendRequest.addTo(phoneNumbers[0]); @@ -514,8 +443,7 @@ public class Transaction { // assign parts to the pdu body which contains sending data long size = 0; if (parts != null) { - for (int i = 0; i < parts.length; i++) { - MMSPart part = parts[i]; + for (MMSPart part : parts) { if (part != null) { try { PduPart partPdu = new PduPart(); @@ -790,7 +718,7 @@ public class Transaction { try { Uri destUri = Uri.parse("content://mms"); - Set recipients = new HashSet(); + Set recipients = new HashSet<>(); recipients.addAll(Arrays.asList(to)); long thread_id = Utils.getOrCreateThreadId(context, recipients); @@ -873,11 +801,15 @@ public class Transaction { ByteArrayInputStream is = new ByteArrayInputStream(imageBytes); byte[] buffer = new byte[256]; - for (int len = 0; (len = is.read(buffer)) != -1; ) { - os.write(buffer, 0, len); + for (int len; (len = is.read(buffer)) != -1; ) { + if (os != null) { + os.write(buffer, 0, len); + } } - os.close(); + if (os != null) { + os.close(); + } is.close(); return res; @@ -891,9 +823,7 @@ public class Transaction { mmsPartValue.put("cid", "<" + System.currentTimeMillis() + ">"); mmsPartValue.put("text", text); Uri partUri = Uri.parse("content://mms/" + id + "/part"); - Uri res = context.getContentResolver().insert(partUri, mmsPartValue); - - return res; + return context.getContentResolver().insert(partUri, mmsPartValue); } // add address to the request @@ -903,9 +833,7 @@ public class Transaction { addrValues.put("charset", "106"); addrValues.put("type", 151); // TO Uri addrUri = Uri.parse("content://mms/" + id + "/addr"); - Uri res = context.getContentResolver().insert(addrUri, addrValues); - - return res; + return context.getContentResolver().insert(addrUri, addrValues); } /** diff --git a/android-smsmms/src/main/java/com/klinker/android/send_message/Utils.java b/android-smsmms/src/main/java/com/klinker/android/send_message/Utils.java index 39a13c41..cf85c4e6 100755 --- a/android-smsmms/src/main/java/com/klinker/android/send_message/Utils.java +++ b/android-smsmms/src/main/java/com/klinker/android/send_message/Utils.java @@ -215,40 +215,22 @@ public class Utils { * @param enabled is whether to enable or disable data */ public static void setMobileDataEnabled(Context context, boolean enabled) { - String methodName; - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) { - try { - ConnectivityManager conman = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE); - Class conmanClass = Class.forName(conman.getClass().getName()); - Field iConnectivityManagerField = conmanClass.getDeclaredField("mService"); - iConnectivityManagerField.setAccessible(true); - Object iConnectivityManager = iConnectivityManagerField.get(conman); - Class iConnectivityManagerClass = Class.forName(iConnectivityManager.getClass().getName()); - Method setMobileDataEnabledMethod = iConnectivityManagerClass.getDeclaredMethod("setMobileDataEnabled", Boolean.TYPE); - setMobileDataEnabledMethod.setAccessible(true); - - setMobileDataEnabledMethod.invoke(iConnectivityManager, enabled); - } catch (Exception e) { - Log.e(TAG, "exception thrown", e); - } - } else { - // TODO find a better way to do this on lollipop! - // This will actually not work due to no permission for android.permission.MODIFY_PHONE_STATE, which - // is a system level permission and cannot be accessed for third party apps. - try { - TelephonyManager tm = (TelephonyManager) context - .getSystemService(Context.TELEPHONY_SERVICE); - Class c = Class.forName(tm.getClass().getName()); - Method m = c.getDeclaredMethod("getITelephony"); - m.setAccessible(true); - Object telephonyService = m.invoke(tm); - c = Class.forName(telephonyService.getClass().getName()); - m = c.getDeclaredMethod("setDataEnabled", Boolean.TYPE); - m.setAccessible(true); - m.invoke(telephonyService, enabled); - } catch (Exception e) { - Log.e(TAG, "error enabling data on lollipop", e); - } + // TODO find a better way to do this on lollipop! + // This will actually not work due to no permission for android.permission.MODIFY_PHONE_STATE, which + // is a system level permission and cannot be accessed for third party apps. + try { + TelephonyManager tm = (TelephonyManager) context + .getSystemService(Context.TELEPHONY_SERVICE); + Class c = Class.forName(tm.getClass().getName()); + Method m = c.getDeclaredMethod("getITelephony"); + m.setAccessible(true); + Object telephonyService = m.invoke(tm); + c = Class.forName(telephonyService.getClass().getName()); + m = c.getDeclaredMethod("setDataEnabled", Boolean.TYPE); + m.setAccessible(true); + m.invoke(telephonyService, enabled); + } catch (Exception e) { + Log.e(TAG, "error enabling data on lollipop", e); } } @@ -309,8 +291,6 @@ public class Utils { long id = cursor.getLong(0); cursor.close(); return id; - } else { - } } finally { cursor.close(); @@ -394,25 +374,14 @@ public class Utils { return sendSettings; } - /** - * Determines whether or not the user has Android 4.4 KitKat - * @return true if version code on device is >= kitkat - */ - public static boolean hasKitKat() { - return Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT; - } - /** * Determines whether or not the app is the default SMS app on a device * @param context * @return true if app is default */ public static boolean isDefaultSmsApp(Context context) { - if (hasKitKat()) { - return context.getPackageName().equals(Telephony.Sms.getDefaultSmsPackage(context)); - } + return context.getPackageName().equals(Telephony.Sms.getDefaultSmsPackage(context)); - return true; } /**