diff --git a/android-smsmms/src/main/java/com/android/internal/telephony/IccUtils.java b/android-smsmms/src/main/java/com/android/internal/telephony/IccUtils.java deleted file mode 100755 index b349222d..00000000 --- a/android-smsmms/src/main/java/com/android/internal/telephony/IccUtils.java +++ /dev/null @@ -1,518 +0,0 @@ -/* - * Copyright (C) 2006 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.internal.telephony; - -import android.content.res.Resources; -import android.graphics.Bitmap; -import android.graphics.Color; -import com.klinker.android.logger.Log; - -import java.io.UnsupportedEncodingException; - -/** - * Various methods, useful for dealing with SIM data. - */ -public class IccUtils { - static final String LOG_TAG = "IccUtils"; - - /** - * Many fields in GSM SIM's are stored as nibble-swizzled BCD - *

- * Assumes left-justified field that may be padded right with 0xf - * values. - *

- * Stops on invalid BCD value, returning string so far - */ - public static String - bcdToString(byte[] data, int offset, int length) { - StringBuilder ret = new StringBuilder(length * 2); - - for (int i = offset; i < offset + length; i++) { - int v; - - v = data[i] & 0xf; - if (v > 9) break; - ret.append((char) ('0' + v)); - - v = (data[i] >> 4) & 0xf; - // Some PLMNs have 'f' as high nibble, ignore it - if (v == 0xf) continue; - if (v > 9) break; - ret.append((char) ('0' + v)); - } - - return ret.toString(); - } - - /** - * Decode cdma byte into String. - */ - public static String - cdmaBcdToString(byte[] data, int offset, int length) { - StringBuilder ret = new StringBuilder(length); - - int count = 0; - for (int i = offset; count < length; i++) { - int v; - v = data[i] & 0xf; - if (v > 9) v = 0; - ret.append((char) ('0' + v)); - - if (++count == length) break; - - v = (data[i] >> 4) & 0xf; - if (v > 9) v = 0; - ret.append((char) ('0' + v)); - ++count; - } - return ret.toString(); - } - - /** - * Decodes a GSM-style BCD byte, returning an int ranging from 0-99. - *

- * In GSM land, the least significant BCD digit is stored in the most - * significant nibble. - *

- * Out-of-range digits are treated as 0 for the sake of the time stamp, - * because of this: - *

- * TS 23.040 section 9.2.3.11 - * "if the MS receives a non-integer value in the SCTS, it shall - * assume the digit is set to 0 but shall store the entire field - * exactly as received" - */ - public static int - gsmBcdByteToInt(byte b) { - int ret = 0; - - // treat out-of-range BCD values as 0 - if ((b & 0xf0) <= 0x90) { - ret = (b >> 4) & 0xf; - } - - if ((b & 0x0f) <= 0x09) { - ret += (b & 0xf) * 10; - } - - return ret; - } - - /** - * Decodes a CDMA style BCD byte like {@link gsmBcdByteToInt}, but - * opposite nibble format. The least significant BCD digit - * is in the least significant nibble and the most significant - * is in the most significant nibble. - */ - public static int - cdmaBcdByteToInt(byte b) { - int ret = 0; - - // treat out-of-range BCD values as 0 - if ((b & 0xf0) <= 0x90) { - ret = ((b >> 4) & 0xf) * 10; - } - - if ((b & 0x0f) <= 0x09) { - ret += (b & 0xf); - } - - return ret; - } - - /** - * Decodes a string field that's formatted like the EF[ADN] alpha - * identifier - *

- * From TS 51.011 10.5.1: - * Coding: - * this alpha tagging shall use either - * - the SMS default 7 bit coded alphabet as defined in - * TS 23.038 [12] with bit 8 set to 0. The alpha identifier - * shall be left justified. Unused bytes shall be set to 'FF'; or - * - one of the UCS2 coded options as defined in annex B. - *

- * Annex B from TS 11.11 V8.13.0: - * 1) If the first octet in the alpha string is '80', then the - * remaining octets are 16 bit UCS2 characters ... - * 2) if the first octet in the alpha string is '81', then the - * second octet contains a value indicating the number of - * characters in the string, and the third octet contains an - * 8 bit number which defines bits 15 to 8 of a 16 bit - * base pointer, where bit 16 is set to zero and bits 7 to 1 - * are also set to zero. These sixteen bits constitute a - * base pointer to a "half page" in the UCS2 code space, to be - * used with some or all of the remaining octets in the string. - * The fourth and subsequent octets contain codings as follows: - * If bit 8 of the octet is set to zero, the remaining 7 bits - * of the octet contain a GSM Default Alphabet character, - * whereas if bit 8 of the octet is set to one, then the - * remaining seven bits are an offset value added to the - * 16 bit base pointer defined earlier... - * 3) If the first octet of the alpha string is set to '82', then - * the second octet contains a value indicating the number of - * characters in the string, and the third and fourth octets - * contain a 16 bit number which defines the complete 16 bit - * base pointer to a "half page" in the UCS2 code space... - */ - public static String - adnStringFieldToString(byte[] data, int offset, int length) { - if (length == 0) { - return ""; - } - if (length >= 1) { - if (data[offset] == (byte) 0x80) { - int ucslen = (length - 1) / 2; - String ret = null; - - try { - ret = new String(data, offset + 1, ucslen * 2, "utf-16be"); - } catch (UnsupportedEncodingException ex) { - Log.e(LOG_TAG, "implausible UnsupportedEncodingException", - ex); - } - - if (ret != null) { - // trim off trailing FFFF characters - - ucslen = ret.length(); - while (ucslen > 0 && ret.charAt(ucslen - 1) == '\uFFFF') - ucslen--; - - return ret.substring(0, ucslen); - } - } - } - - boolean isucs2 = false; - char base = '\0'; - int len = 0; - - if (length >= 3 && data[offset] == (byte) 0x81) { - len = data[offset + 1] & 0xFF; - if (len > length - 3) - len = length - 3; - - base = (char) ((data[offset + 2] & 0xFF) << 7); - offset += 3; - isucs2 = true; - } else if (length >= 4 && data[offset] == (byte) 0x82) { - len = data[offset + 1] & 0xFF; - if (len > length - 4) - len = length - 4; - - base = (char) (((data[offset + 2] & 0xFF) << 8) | - (data[offset + 3] & 0xFF)); - offset += 4; - isucs2 = true; - } - - if (isucs2) { - StringBuilder ret = new StringBuilder(); - - while (len > 0) { - // UCS2 subset case - - if (data[offset] < 0) { - ret.append((char) (base + (data[offset] & 0x7F))); - offset++; - len--; - } - - // GSM character set case - - int count = 0; - while (count < len && data[offset + count] >= 0) - count++; - - ret.append(GsmAlphabet.gsm8BitUnpackedToString(data, - offset, count)); - - offset += count; - len -= count; - } - - return ret.toString(); - } - - Resources resource = Resources.getSystem(); - String defaultCharset = ""; - return GsmAlphabet.gsm8BitUnpackedToString(data, offset, length, defaultCharset.trim()); - } - - static int - hexCharToInt(char c) { - if (c >= '0' && c <= '9') return (c - '0'); - if (c >= 'A' && c <= 'F') return (c - 'A' + 10); - if (c >= 'a' && c <= 'f') return (c - 'a' + 10); - - throw new RuntimeException("invalid hex char '" + c + "'"); - } - - /** - * Converts a hex String to a byte array. - * - * @param s A string of hexadecimal characters, must be an even number of - * chars long - * @return byte array representation - * @throws RuntimeException on invalid format - */ - public static byte[] - hexStringToBytes(String s) { - byte[] ret; - - if (s == null) return null; - - int sz = s.length(); - - ret = new byte[sz / 2]; - - for (int i = 0; i < sz; i += 2) { - ret[i / 2] = (byte) ((hexCharToInt(s.charAt(i)) << 4) - | hexCharToInt(s.charAt(i + 1))); - } - - return ret; - } - - - /** - * Converts a byte array into a String of hexadecimal characters. - * - * @param bytes an array of bytes - * @return hex string representation of bytes array - */ - public static String - bytesToHexString(byte[] bytes) { - if (bytes == null) return null; - - StringBuilder ret = new StringBuilder(2 * bytes.length); - - for (int i = 0; i < bytes.length; i++) { - int b; - - b = 0x0f & (bytes[i] >> 4); - - ret.append("0123456789abcdef".charAt(b)); - - b = 0x0f & bytes[i]; - - ret.append("0123456789abcdef".charAt(b)); - } - - return ret.toString(); - } - - - /** - * Convert a TS 24.008 Section 10.5.3.5a Network Name field to a string - * "offset" points to "octet 3", the coding scheme byte - * empty string returned on decode error - */ - public static String - networkNameToString(byte[] data, int offset, int length) { - String ret; - - if ((data[offset] & 0x80) != 0x80 || length < 1) { - return ""; - } - - switch ((data[offset] >>> 4) & 0x7) { - case 0: - // SMS character set - int countSeptets; - int unusedBits = data[offset] & 7; - countSeptets = (((length - 1) * 8) - unusedBits) / 7; - ret = GsmAlphabet.gsm7BitPackedToString(data, offset + 1, countSeptets); - break; - case 1: - // UCS2 - try { - ret = new String(data, - offset + 1, length - 1, "utf-16"); - } catch (UnsupportedEncodingException ex) { - ret = ""; - Log.e(LOG_TAG, "implausible UnsupportedEncodingException", ex); - } - break; - - // unsupported encoding - default: - ret = ""; - break; - } - - // "Add CI" - // "The MS should add the letters for the Country's Initials and - // a separator (e.g. a space) to the text string" - - if ((data[offset] & 0x40) != 0) { - // FIXME(mkf) add country initials here - - } - - return ret; - } - - /** - * Convert a TS 131.102 image instance of code scheme '11' into Bitmap - * - * @param data The raw data - * @param length The length of image body - * @return The bitmap - */ - public static Bitmap parseToBnW(byte[] data, int length) { - int valueIndex = 0; - int width = data[valueIndex++] & 0xFF; - int height = data[valueIndex++] & 0xFF; - int numOfPixels = width * height; - - int[] pixels = new int[numOfPixels]; - - int pixelIndex = 0; - int bitIndex = 7; - byte currentByte = 0x00; - while (pixelIndex < numOfPixels) { - // reassign data and index for every byte (8 bits). - if (pixelIndex % 8 == 0) { - currentByte = data[valueIndex++]; - bitIndex = 7; - } - pixels[pixelIndex++] = bitToRGB((currentByte >> bitIndex--) & 0x01); - } - ; - - if (pixelIndex != numOfPixels) { - Log.e(LOG_TAG, "parse end and size error"); - } - return Bitmap.createBitmap(pixels, width, height, Bitmap.Config.ARGB_8888); - } - - private static int bitToRGB(int bit) { - if (bit == 1) { - return Color.WHITE; - } else { - return Color.BLACK; - } - } - - /** - * a TS 131.102 image instance of code scheme '11' into color Bitmap - * - * @param data The raw data - * @param length the length of image body - * @param transparency with or without transparency - * @return The color bitmap - */ - public static Bitmap parseToRGB(byte[] data, int length, - boolean transparency) { - int valueIndex = 0; - int width = data[valueIndex++] & 0xFF; - int height = data[valueIndex++] & 0xFF; - int bits = data[valueIndex++] & 0xFF; - int colorNumber = data[valueIndex++] & 0xFF; - int clutOffset = ((data[valueIndex++] & 0xFF) << 8) - | (data[valueIndex++] & 0xFF); - - int[] colorIndexArray = getCLUT(data, clutOffset, colorNumber); - if (true == transparency) { - colorIndexArray[colorNumber - 1] = Color.TRANSPARENT; - } - - int[] resultArray = null; - if (0 == (8 % bits)) { - resultArray = mapTo2OrderBitColor(data, valueIndex, - (width * height), colorIndexArray, bits); - } else { - resultArray = mapToNon2OrderBitColor(data, valueIndex, - (width * height), colorIndexArray, bits); - } - - return Bitmap.createBitmap(resultArray, width, height, - Bitmap.Config.RGB_565); - } - - private static int[] mapTo2OrderBitColor(byte[] data, int valueIndex, - int length, int[] colorArray, int bits) { - if (0 != (8 % bits)) { - Log.e(LOG_TAG, "not event number of color"); - return mapToNon2OrderBitColor(data, valueIndex, length, colorArray, - bits); - } - - int mask = 0x01; - switch (bits) { - case 1: - mask = 0x01; - break; - case 2: - mask = 0x03; - break; - case 4: - mask = 0x0F; - break; - case 8: - mask = 0xFF; - break; - } - - int[] resultArray = new int[length]; - int resultIndex = 0; - int run = 8 / bits; - while (resultIndex < length) { - byte tempByte = data[valueIndex++]; - for (int runIndex = 0; runIndex < run; ++runIndex) { - int offset = run - runIndex - 1; - resultArray[resultIndex++] = colorArray[(tempByte >> (offset * bits)) - & mask]; - } - } - return resultArray; - } - - private static int[] mapToNon2OrderBitColor(byte[] data, int valueIndex, - int length, int[] colorArray, int bits) { - if (0 == (8 % bits)) { - Log.e(LOG_TAG, "not odd number of color"); - return mapTo2OrderBitColor(data, valueIndex, length, colorArray, - bits); - } - - int[] resultArray = new int[length]; - // TODO fix me: - return resultArray; - } - - private static int[] getCLUT(byte[] rawData, int offset, int number) { - if (null == rawData) { - return null; - } - - int[] result = new int[number]; - int endIndex = offset + (number * 3); // 1 color use 3 bytes - int valueIndex = offset; - int colorIndex = 0; - int alpha = 0xff << 24; - do { - result[colorIndex++] = alpha - | ((rawData[valueIndex++] & 0xFF) << 16) - | ((rawData[valueIndex++] & 0xFF) << 8) - | ((rawData[valueIndex++] & 0xFF)); - } while (valueIndex < endIndex); - return result; - } -} diff --git a/android-smsmms/src/main/java/com/android/mms/MmsConfig.java b/android-smsmms/src/main/java/com/android/mms/MmsConfig.java index 2b43103b..2cab73f9 100755 --- a/android-smsmms/src/main/java/com/android/mms/MmsConfig.java +++ b/android-smsmms/src/main/java/com/android/mms/MmsConfig.java @@ -33,10 +33,6 @@ public class MmsConfig { public static final String DEFAULT_HTTP_KEY_X_WAP_PROFILE = "x-wap-profile"; public static final String DEFAULT_USER_AGENT = "Android-Mms/2.0"; - private static final String MMS_APP_PACKAGE = "com.android.mms"; - - private static final String SMS_PROMO_DISMISSED_KEY = "sms_promo_dismissed_key"; - private static final int MAX_IMAGE_HEIGHT = 480; private static final int MAX_IMAGE_WIDTH = 640; private static final int MAX_TEXT_LENGTH = 2000; diff --git a/android-smsmms/src/main/java/com/android/mms/service_alt/SendRequest.java b/android-smsmms/src/main/java/com/android/mms/service_alt/SendRequest.java deleted file mode 100755 index 91717f76..00000000 --- a/android-smsmms/src/main/java/com/android/mms/service_alt/SendRequest.java +++ /dev/null @@ -1,229 +0,0 @@ -/* - * Copyright (C) 2015 Jacob Klinker - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.mms.service_alt; - -import android.app.Activity; -import android.app.PendingIntent; -import android.content.ContentValues; -import android.content.Context; -import android.content.Intent; -import android.net.Uri; -import android.os.Binder; -import android.os.Bundle; -import android.provider.Telephony; -import android.telephony.SmsManager; -import android.text.TextUtils; -import com.android.mms.service_alt.exception.MmsHttpException; -import com.google.android.mms.pdu_alt.GenericPdu; -import com.google.android.mms.pdu_alt.PduHeaders; -import com.google.android.mms.pdu_alt.PduParser; -import com.google.android.mms.pdu_alt.PduPersister; -import com.google.android.mms.pdu_alt.SendConf; -import com.google.android.mms.pdu_alt.SendReq; -import com.google.android.mms.util_alt.SqliteWrapper; -import com.klinker.android.logger.Log; - -/** - * Request to send an MMS - */ -public class SendRequest extends MmsRequest { - private static final String TAG = "SendRequest"; - - private final Uri mPduUri; - private byte[] mPduData; - private final String mLocationUrl; - private final PendingIntent mSentIntent; - - public SendRequest(RequestManager manager, int subId, Uri contentUri, String locationUrl, - PendingIntent sentIntent, String creator, Bundle configOverrides) { - super(manager, subId, creator, configOverrides); - mPduUri = contentUri; - mPduData = null; - mLocationUrl = locationUrl; - mSentIntent = sentIntent; - } - - @Override - protected byte[] doHttp(Context context, MmsNetworkManager netMgr, ApnSettings apn) - throws MmsHttpException { - final MmsHttpClient mmsHttpClient = netMgr.getOrCreateHttpClient(); - if (mmsHttpClient == null) { - Log.e(TAG, "MMS network is not ready!"); - throw new MmsHttpException(0/*statusCode*/, "MMS network is not ready"); - } - return mmsHttpClient.execute( - mLocationUrl != null ? mLocationUrl : apn.getMmscUrl(), - mPduData, - MmsHttpClient.METHOD_POST, - apn.isProxySet(), - apn.getProxyAddress(), - apn.getProxyPort(), - mMmsConfig); - } - - @Override - protected PendingIntent getPendingIntent() { - return mSentIntent; - } - - @Override - protected int getQueueType() { - return 0; - } - - @Override - protected Uri persistIfRequired(Context context, int result, byte[] response) { - Log.d(TAG, "SendRequest.persistIfRequired"); - if (mPduData == null) { - Log.e(TAG, "SendRequest.persistIfRequired: empty PDU"); - return null; - } - final long identity = Binder.clearCallingIdentity(); - try { - final boolean supportContentDisposition = mMmsConfig.getSupportMmsContentDisposition(); - // Persist the request PDU first - GenericPdu pdu = (new PduParser(mPduData, supportContentDisposition)).parse(); - if (pdu == null) { - Log.e(TAG, "SendRequest.persistIfRequired: can't parse input PDU"); - return null; - } - if (!(pdu instanceof SendReq)) { - Log.d(TAG, "SendRequest.persistIfRequired: not SendReq"); - return null; - } -// final PduPersister persister = PduPersister.getPduPersister(context); -// final Uri messageUri = persister.persist( -// pdu, -// Telephony.Mms.Sent.CONTENT_URI, -// true/*createThreadId*/, -// true/*groupMmsEnabled*/, -// null/*preOpenedFiles*/); -// if (messageUri == null) { -// Log.e(TAG, "SendRequest.persistIfRequired: can not persist message"); -// return null; -// } - // Update the additional columns based on the send result - final ContentValues values = new ContentValues(); - SendConf sendConf = null; - if (response != null && response.length > 0) { - pdu = (new PduParser(response, supportContentDisposition)).parse(); - if (pdu != null && pdu instanceof SendConf) { - sendConf = (SendConf) pdu; - } - } - if (result != Activity.RESULT_OK - || sendConf == null - || sendConf.getResponseStatus() != PduHeaders.RESPONSE_STATUS_OK) { - // Since we can't persist a message directly into FAILED box, - // we have to update the column after we persist it into SENT box. - // The gap between the state change is tiny so I would not expect - // it to cause any serious problem - // TODO: we should add a "failed" URI for this in MmsProvider? - values.put(Telephony.Mms.MESSAGE_BOX, Telephony.Mms.MESSAGE_BOX_FAILED); - } else { - values.put(Telephony.Mms.MESSAGE_BOX, Telephony.Mms.MESSAGE_BOX_SENT); - } - if (sendConf != null) { - values.put(Telephony.Mms.RESPONSE_STATUS, sendConf.getResponseStatus()); - Log.v(TAG, "response status: " + sendConf.getResponseStatus()); - values.put(Telephony.Mms.MESSAGE_ID, - PduPersister.toIsoString(sendConf.getMessageId())); - } - values.put(Telephony.Mms.DATE, System.currentTimeMillis() / 1000L); - values.put(Telephony.Mms.READ, 1); - values.put(Telephony.Mms.SEEN, 1); - if (!TextUtils.isEmpty(mCreator)) { - values.put(Telephony.Mms.CREATOR, mCreator); - } - if (SubscriptionIdChecker.getInstance(context).canUseSubscriptionId()) { - values.put(Telephony.Mms.SUBSCRIPTION_ID, mSubId); - } - if (SqliteWrapper.update(context, context.getContentResolver(), mPduUri, values, - null/*where*/, null/*selectionArg*/) != 1) { - Log.e(TAG, "SendRequest.persistIfRequired: failed to update message"); - } - return mPduUri; -// } catch (MmsException e) { -// Log.e(TAG, "SendRequest.persistIfRequired: can not persist message", e); - } catch (RuntimeException e) { - Log.e(TAG, "SendRequest.persistIfRequired: unexpected parsing failure", e); - } finally { - Binder.restoreCallingIdentity(identity); - } - return null; - } - - /** - * Read the pdu from the file descriptor and cache pdu bytes in request - * @return true if pdu read successfully - */ - private boolean readPduFromContentUri() { - if (mPduData != null) { - return true; - } - final int bytesTobeRead = mMmsConfig.getMaxMessageSize(); - mPduData = mRequestManager.readPduFromContentUri(mPduUri, bytesTobeRead); - return (mPduData != null); - } - - /** - * Transfer the received response to the caller (for send requests the pdu is small and can - * just include bytes as extra in the "returned" intent). - * - * @param fillIn the intent that will be returned to the caller - * @param response the pdu to transfer - */ - @Override - protected boolean transferResponse(Intent fillIn, byte[] response) { - // SendConf pdus are always small and can be included in the intent - if (response != null) { - fillIn.putExtra(SmsManager.EXTRA_MMS_DATA, response); - } - return true; - } - - /** - * Read the data from the file descriptor if not yet done - * @return whether data successfully read - */ - @Override - protected boolean prepareForHttpRequest() { - return readPduFromContentUri(); - } - - /** - * Try sending via the carrier app - * - * @param context the context - * @param carrierMessagingServicePackage the carrier messaging service sending the MMS - */ - public void trySendingByCarrierApp(Context context, String carrierMessagingServicePackage) { -// final CarrierSendManager carrierSendManger = new CarrierSendManager(); -// final CarrierSendCompleteCallback sendCallback = new CarrierSendCompleteCallback( -// context, carrierSendManger); -// carrierSendManger.sendMms(context, carrierMessagingServicePackage, sendCallback); - } - - @Override - protected void revokeUriPermission(Context context) { - try { - context.revokeUriPermission(mPduUri, Intent.FLAG_GRANT_READ_URI_PERMISSION); - } catch (NullPointerException e) { - Log.e(TAG, "error revoking permissions", e); - } - } -} diff --git a/android-smsmms/src/main/java/com/google/android/mms/APN.java b/android-smsmms/src/main/java/com/google/android/mms/APN.java deleted file mode 100755 index 861a6eca..00000000 --- a/android-smsmms/src/main/java/com/google/android/mms/APN.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.google.android.mms; - -public class APN { - public String MMSCenterUrl = ""; - public String MMSPort = ""; - public String MMSProxy = ""; - - public APN(String MMSCenterUrl, String MMSPort, String MMSProxy) { - this.MMSCenterUrl = MMSCenterUrl; - this.MMSPort = MMSPort; - this.MMSProxy = MMSProxy; - } - - public APN() { - - } -} \ No newline at end of file diff --git a/android-smsmms/src/main/java/com/google/android/mms/APNHelper.java b/android-smsmms/src/main/java/com/google/android/mms/APNHelper.java deleted file mode 100755 index eab68a81..00000000 --- a/android-smsmms/src/main/java/com/google/android/mms/APNHelper.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.google.android.mms; - -import android.content.Context; -import android.database.Cursor; -import android.net.Uri; -import android.text.TextUtils; -import android.widget.Toast; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -public class APNHelper { - - public APNHelper(final Context context) { - this.context = context; - } - - @SuppressWarnings("unchecked") - public List getMMSApns() { - try { - final Cursor apnCursor = this.context.getContentResolver().query(Uri.withAppendedPath(Uri.parse("content://telephony/carriers"), "current"), null, null, null, null); - if (apnCursor == null) { - return Collections.EMPTY_LIST; - } else { - final List results = new ArrayList(); - if (apnCursor.moveToFirst()) { - do { - final String type = apnCursor.getString(apnCursor.getColumnIndex("type")); - if (!TextUtils.isEmpty(type) && (type.equalsIgnoreCase("*") || type.equalsIgnoreCase("mms"))) { - final String mmsc = apnCursor.getString(apnCursor.getColumnIndex("mmsc")); - final String mmsProxy = apnCursor.getString(apnCursor.getColumnIndex("mmsproxy")); - final String port = apnCursor.getString(apnCursor.getColumnIndex("mmsport")); - final APN apn = new APN(); - apn.MMSCenterUrl = mmsc; - apn.MMSProxy = mmsProxy; - apn.MMSPort = port; - results.add(apn); - - Toast.makeText(context, mmsc + " " + mmsProxy + " " + port, Toast.LENGTH_LONG).show(); - } - } while (apnCursor.moveToNext()); - } - apnCursor.close(); - return results; - } - } catch (Exception e) { - // insignificant permissions - return Collections.EMPTY_LIST; - } - } - - private Context context; -} diff --git a/android-smsmms/src/main/java/com/google/android/mms/util_alt/PduCache.java b/android-smsmms/src/main/java/com/google/android/mms/util_alt/PduCache.java index 7b389763..878f91e7 100755 --- a/android-smsmms/src/main/java/com/google/android/mms/util_alt/PduCache.java +++ b/android-smsmms/src/main/java/com/google/android/mms/util_alt/PduCache.java @@ -27,7 +27,6 @@ import java.util.HashSet; public final class PduCache extends AbstractCache { private static final String TAG = "PduCache"; - private static final boolean DEBUG = false; private static final boolean LOCAL_LOGV = false; private static final int MMS_ALL = 0; diff --git a/presentation/src/main/java/common/util/extensions/ViewExtensions.kt b/presentation/src/main/java/common/util/extensions/ViewExtensions.kt index 13ade72b..85f35a5b 100644 --- a/presentation/src/main/java/common/util/extensions/ViewExtensions.kt +++ b/presentation/src/main/java/common/util/extensions/ViewExtensions.kt @@ -20,13 +20,12 @@ package common.util.extensions import android.content.Context import android.content.res.ColorStateList -import android.support.v4.view.ViewPager +import android.graphics.PorterDuff +import android.os.Build import android.view.View -import android.view.ViewGroup import android.view.inputmethod.InputMethodManager import android.widget.EditText import android.widget.ImageView -import io.reactivex.Observable fun EditText.showKeyboard() { requestFocus() @@ -39,21 +38,15 @@ fun ImageView.setTint(color: Int) { } fun View.setBackgroundTint(color: Int) { + + // API 21 doesn't support this + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP_MR1) { + background.setColorFilter(color, PorterDuff.Mode.SRC_ATOP) + } + backgroundTintList = ColorStateList.valueOf(color) } -fun View.setMargins(left: Int? = null, top: Int? = null, right: Int? = null, bottom: Int? = null) { - val lp = layoutParams as? ViewGroup.MarginLayoutParams ?: return - - lp.setMargins( - left ?: lp.leftMargin, - top ?: lp.topMargin, - right ?: lp.rightMargin, - bottom ?: lp.rightMargin) - - layoutParams = lp -} - fun View.setPadding(left: Int? = null, top: Int? = null, right: Int? = null, bottom: Int? = null) { setPadding(left ?: paddingLeft, top ?: paddingTop, right ?: paddingRight, bottom ?: paddingBottom) } @@ -62,15 +55,3 @@ fun View.setVisible(visible: Boolean, invisible: Int = View.GONE) { visibility = if (visible) View.VISIBLE else invisible } -data class PageScroll(val position: Int, val offset: Float) - -fun ViewPager.pageScrolled(): Observable { - return Observable.create { emitter -> - addOnPageChangeListener(object : ViewPager.SimpleOnPageChangeListener() { - override fun onPageScrolled(position: Int, positionOffset: Float, positionOffsetPixels: Int) { - super.onPageScrolled(position, positionOffset, positionOffsetPixels) - emitter.onNext(PageScroll(position, positionOffset)) - } - }) - } -} \ No newline at end of file diff --git a/presentation/src/main/java/common/widget/AvatarView.kt b/presentation/src/main/java/common/widget/AvatarView.kt index b3753cb9..f400a389 100644 --- a/presentation/src/main/java/common/widget/AvatarView.kt +++ b/presentation/src/main/java/common/widget/AvatarView.kt @@ -32,6 +32,7 @@ import com.uber.autodispose.kotlin.autoDisposable import common.Navigator import common.util.Colors import common.util.GlideApp +import common.util.extensions.setBackgroundTint import common.util.extensions.setTint import injection.appComponent import kotlinx.android.synthetic.main.avatar_view.view.* @@ -90,15 +91,12 @@ class AvatarView @JvmOverloads constructor(context: Context, attrs: AttributeSet if (!isInEditMode) { colors.themeForConversation(threadId) .autoDisposable(scope()) - .subscribe { color -> background.setTint(color) } + .subscribe { color -> setBackgroundTint(color) } - colors.textPrimaryOnThemeForConversation(threadId).let { observable -> - initial.textColorObservable = observable - - observable - .autoDisposable(scope()) - .subscribe { color -> icon.setTint(color) } - } + colors.textPrimaryOnThemeForConversation(threadId) + .apply { initial.textColorObservable = this } + .autoDisposable(scope()) + .subscribe { color -> icon.setTint(color) } clicks() .autoDisposable(scope()) diff --git a/presentation/src/main/java/feature/compose/MessagesAdapter.kt b/presentation/src/main/java/feature/compose/MessagesAdapter.kt index 0e1a8bf3..8ad88c33 100644 --- a/presentation/src/main/java/feature/compose/MessagesAdapter.kt +++ b/presentation/src/main/java/feature/compose/MessagesAdapter.kt @@ -19,6 +19,7 @@ package feature.compose import android.content.Context +import android.os.Build import android.support.v7.widget.RecyclerView import android.telephony.PhoneNumberUtils import android.view.LayoutInflater @@ -224,6 +225,14 @@ class MessagesAdapter @Inject constructor( // setClipToOutline doesn't work unless all of the corners have the same radius, so we have // to use the message_only bubble if (hasImages) view.messageBackground.setBackgroundResource(R.drawable.message_only) + + // If we're on API 21, we need to re-tint the background + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP_MR1) { + view.messageBackground.setBackgroundTint(when (message.isMe()) { + true -> colors.bubble + false -> theme + }.blockingFirst()) + } } private fun canGroup(message: Message, other: Message?): Boolean { diff --git a/presentation/src/main/res/layout/settings_activity.xml b/presentation/src/main/res/layout/settings_activity.xml index 7d81fac2..a4808911 100644 --- a/presentation/src/main/res/layout/settings_activity.xml +++ b/presentation/src/main/res/layout/settings_activity.xml @@ -134,7 +134,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:visibility="gone" - app:summary="@string/settings_auto_emoji_summary" app:title="@string/settings_auto_emoji_title" app:widget="@layout/settings_switch_widget" /> diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml index ff78ba05..7ed75eef 100644 --- a/presentation/src/main/res/values/strings.xml +++ b/presentation/src/main/res/values/strings.xml @@ -89,7 +89,6 @@ Start time End time Automatic emoji - Convert text like :) to an emoji like 🙂 Notifications Vibration Sound