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/android-smsmms/src/main/res/drawable/ic_translate_black_24dp.xml b/android-smsmms/src/main/res/drawable/ic_translate_black_24dp.xml
new file mode 100644
index 00000000..f0187727
--- /dev/null
+++ b/android-smsmms/src/main/res/drawable/ic_translate_black_24dp.xml
@@ -0,0 +1,27 @@
+
+
+
+
diff --git a/build.gradle b/build.gradle
index 5b569c79..0c9bba2b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -27,7 +27,7 @@ buildscript {
}
dependencies {
- classpath 'com.android.tools.build:gradle:3.1.0'
+ classpath 'com.android.tools.build:gradle:3.1.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "io.realm:realm-gradle-plugin:4.3.1"
}
diff --git a/data/src/main/java/mapper/CursorToRecipienImpl.kt b/data/src/main/java/mapper/CursorToRecipientImpl.kt
similarity index 93%
rename from data/src/main/java/mapper/CursorToRecipienImpl.kt
rename to data/src/main/java/mapper/CursorToRecipientImpl.kt
index 15651e12..08b6258a 100644
--- a/data/src/main/java/mapper/CursorToRecipienImpl.kt
+++ b/data/src/main/java/mapper/CursorToRecipientImpl.kt
@@ -24,7 +24,7 @@ import android.net.Uri
import model.Recipient
import javax.inject.Inject
-class CursorToRecipienImpl @Inject constructor(private val context: Context) : CursorToRecipient {
+class CursorToRecipientImpl @Inject constructor(private val context: Context) : CursorToRecipient {
companion object {
val URI = Uri.parse("content://mms-sms/canonical-addresses")
diff --git a/data/src/main/java/repository/ContactRepositoryImpl.kt b/data/src/main/java/repository/ContactRepositoryImpl.kt
index b62fbc32..ca8adf9f 100644
--- a/data/src/main/java/repository/ContactRepositoryImpl.kt
+++ b/data/src/main/java/repository/ContactRepositoryImpl.kt
@@ -20,6 +20,7 @@ package repository
import android.content.Context
import android.net.Uri
+import android.provider.BaseColumns
import android.provider.ContactsContract
import io.reactivex.Flowable
import io.reactivex.Single
@@ -37,11 +38,16 @@ class ContactRepositoryImpl @Inject constructor(val context: Context) : ContactR
override fun findContactUri(address: String): Single {
return Flowable.just(address)
- .map { Uri.withAppendedPath(ContactsContract.PhoneLookup.CONTENT_FILTER_URI, Uri.encode(address)) }
- .mapNotNull { uri -> context.contentResolver.query(uri, arrayOf(ContactsContract.PhoneLookup._ID), null, null, null) }
+ .map {
+ when {
+ address.contains('@') -> Uri.withAppendedPath(ContactsContract.CommonDataKinds.Email.CONTENT_FILTER_URI, Uri.encode(address))
+ else -> Uri.withAppendedPath(ContactsContract.PhoneLookup.CONTENT_FILTER_URI, Uri.encode(address))
+ }
+ }
+ .mapNotNull { uri -> context.contentResolver.query(uri, arrayOf(BaseColumns._ID), null, null, null) }
.flatMap { cursor -> cursor.asFlowable() }
.firstOrError()
- .map { cursor -> cursor.getString(cursor.getColumnIndexOrThrow(ContactsContract.PhoneLookup._ID)) }
+ .map { cursor -> cursor.getString(cursor.getColumnIndexOrThrow(BaseColumns._ID)) }
.map { id -> Uri.withAppendedPath(ContactsContract.Contacts.CONTENT_URI, id) }
}
diff --git a/data/src/main/java/repository/MessageRepositoryImpl.kt b/data/src/main/java/repository/MessageRepositoryImpl.kt
index 3f950e00..b4989ab9 100644
--- a/data/src/main/java/repository/MessageRepositoryImpl.kt
+++ b/data/src/main/java/repository/MessageRepositoryImpl.kt
@@ -23,7 +23,6 @@ import android.content.ContentUris
import android.content.ContentValues
import android.content.Context
import android.content.Intent
-import android.database.Cursor
import android.net.Uri
import android.provider.BaseColumns
import android.provider.Telephony
@@ -47,7 +46,6 @@ import model.Message
import model.MmsPart
import util.MessageUtils
import util.Preferences
-import util.extensions.asFlowable
import util.extensions.asMaybe
import util.extensions.insertOrUpdate
import util.extensions.map
@@ -327,40 +325,34 @@ class MessageRepositoryImpl @Inject constructor(
}
override fun markRead(threadId: Long) {
- // TODO also need to mark MMS in ContentProvider as Read
- val projection = arrayOf(BaseColumns._ID)
- val selection = "${Telephony.Sms.THREAD_ID} = $threadId AND (${Telephony.Sms.SEEN} = 0 OR ${Telephony.Sms.READ} = 0)"
- val contentResolver = context.contentResolver
- contentResolver.query(Telephony.Sms.Inbox.CONTENT_URI, projection, selection, null, null)
- ?.asFlowable() ?: Flowable.empty()
- .subscribeOn(Schedulers.io())
- .map { cursor -> cursor.getLong(0) }
- .map { id -> Uri.withAppendedPath(Telephony.Sms.CONTENT_URI, id.toString()) }
- .subscribe { uri ->
- val values = ContentValues()
- values.put(Telephony.Sms.SEEN, true)
- values.put(Telephony.Sms.READ, true)
- contentResolver.update(uri, values, null, null)
+ Realm.getDefaultInstance()?.use { realm ->
+ val messages = realm.where(Message::class.java)
+ .equalTo("threadId", threadId)
+ .beginGroup()
+ .equalTo("read", false)
+ .or()
+ .equalTo("seen", false)
+ .endGroup()
+ .findAll()
+
+ realm.executeTransaction {
+ messages.forEach { message ->
+ message.seen = true
+ message.read = true
}
-
-
- val realm = Realm.getDefaultInstance()
- val messages = realm.where(Message::class.java)
- .equalTo("threadId", threadId)
- .beginGroup()
- .equalTo("read", false)
- .or()
- .equalTo("seen", false)
- .endGroup()
- .findAll()
-
- realm.executeTransaction {
- messages.forEach { message ->
- message.seen = true
- message.read = true
}
}
- realm.close()
+
+ val values = ContentValues()
+ values.put(Telephony.Sms.SEEN, true)
+ values.put(Telephony.Sms.READ, true)
+
+ try {
+ val uri = ContentUris.withAppendedId(Telephony.MmsSms.CONTENT_CONVERSATIONS_URI, threadId)
+ context.contentResolver.update(uri, values, "${Telephony.Sms.READ} = 0", null)
+ } catch (exception: Exception) {
+
+ }
}
override fun sendSmsAndPersist(threadId: Long, address: String, body: String) {
diff --git a/data/src/main/java/repository/SyncRepositoryImpl.kt b/data/src/main/java/repository/SyncRepositoryImpl.kt
index 15c36637..29a2ad94 100644
--- a/data/src/main/java/repository/SyncRepositoryImpl.kt
+++ b/data/src/main/java/repository/SyncRepositoryImpl.kt
@@ -23,6 +23,7 @@ import android.content.ContentUris
import android.net.Uri
import android.provider.Telephony
import android.telephony.PhoneNumberUtils
+import com.f2prateek.rx.preferences2.RxSharedPreferences
import io.realm.Realm
import mapper.CursorToContact
import mapper.CursorToConversation
@@ -48,7 +49,8 @@ class SyncRepositoryImpl @Inject constructor(
private val cursorToConversation: CursorToConversation,
private val cursorToMessage: CursorToMessage,
private val cursorToRecipient: CursorToRecipient,
- private val cursorToContact: CursorToContact
+ private val cursorToContact: CursorToContact,
+ private val rxPrefs: RxSharedPreferences
) : SyncRepository {
sealed class Status {
@@ -72,10 +74,10 @@ class SyncRepositoryImpl @Inject constructor(
val realm = Realm.getDefaultInstance()
realm.beginTransaction()
- var persistedData: List? = null
+ var persistedData: List = listOf()
if (fullSync) {
- persistedData = realm.where(Conversation::class.java)
+ persistedData += realm.where(Conversation::class.java)
.beginGroup()
.equalTo("archived", true)
.or()
@@ -106,13 +108,19 @@ class SyncRepositoryImpl @Inject constructor(
realm.insertOrUpdate(messages)
}
+ // Migrate blocked conversations from 2.7.3
+ val oldBlockedSenders = rxPrefs.getStringSet("pref_key_blocked_senders")
+ persistedData += oldBlockedSenders.get()
+ .map { threadIdString -> threadIdString.toLong() }
+ .filter { threadId -> persistedData.none { it.id == threadId } }
+ .map { threadId -> PersistedData(threadId, false, true) }
// Sync conversations
cursorToConversation.getConversationsCursor()?.use { conversationCursor ->
val conversations = conversationCursor
.map { cursor -> cursorToConversation.map(cursor) }
- persistedData?.forEach { data ->
+ persistedData.forEach { data ->
val conversation = conversations.firstOrNull { conversation -> conversation.id == data.id }
conversation?.archived = data.archived
conversation?.blocked = data.blocked
@@ -131,6 +139,9 @@ class SyncRepositoryImpl @Inject constructor(
realm.commitTransaction()
realm.close()
+ // Only delete this after the sync has successfully completed
+ oldBlockedSenders.delete()
+
syncContacts()
status = Status.Idle()
diff --git a/data/src/main/java/util/Preferences.kt b/data/src/main/java/util/Preferences.kt
index e6eabe85..4027c0f6 100644
--- a/data/src/main/java/util/Preferences.kt
+++ b/data/src/main/java/util/Preferences.kt
@@ -50,8 +50,8 @@ class Preferences @Inject constructor(private val rxPrefs: RxSharedPreferences)
val delivery = rxPrefs.getBoolean("delivery", false)
val textSize = rxPrefs.getInteger("textSize", TEXT_SIZE_NORMAL)
val qkreply = rxPrefs.getBoolean("qkreply", Build.VERSION.SDK_INT < Build.VERSION_CODES.N)
+ val qkreplyTapDismiss = rxPrefs.getBoolean("qkreplyTapDismiss", true)
val unicode = rxPrefs.getBoolean("unicode", false)
- val mms = rxPrefs.getBoolean("mms", true)
val mmsSize = rxPrefs.getInteger("mmsSize", 100)
fun theme(threadId: Long = 0): Preference {
diff --git a/data/src/main/java/util/extensions/StringExtensions.kt b/data/src/main/java/util/extensions/StringExtensions.kt
new file mode 100644
index 00000000..bb1f8699
--- /dev/null
+++ b/data/src/main/java/util/extensions/StringExtensions.kt
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2017 Moez Bhatti
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS. If not, see .
+ */
+package util.extensions
+
+import java.text.Normalizer
+
+/**
+ * Strip the accents from a string
+ */
+fun CharSequence.removeAccents() = Normalizer.normalize(this, Normalizer.Form.NFD)
+ .replace(Regex("[^\\p{ASCII}]"), "")
\ No newline at end of file
diff --git a/domain/src/main/java/manager/AnalyticsManager.kt b/domain/src/main/java/manager/AnalyticsManager.kt
index 9fd2beb7..89ed3935 100644
--- a/domain/src/main/java/manager/AnalyticsManager.kt
+++ b/domain/src/main/java/manager/AnalyticsManager.kt
@@ -20,7 +20,7 @@ package manager
interface AnalyticsManager {
- fun track(event: String)
+ fun track(event: String, vararg properties: Pair)
fun setUserProperty(key: String, value: Any)
diff --git a/domain/src/main/java/model/Message.kt b/domain/src/main/java/model/Message.kt
index b3e3536a..222df3e3 100644
--- a/domain/src/main/java/model/Message.kt
+++ b/domain/src/main/java/model/Message.kt
@@ -133,7 +133,7 @@ open class Message : RealmObject() {
* Cleanses the subject in case it's useless, so that the UI doesn't have to show it
*/
fun getCleansedSubject(): String {
- val uselessSubjects = listOf("no subject")
+ val uselessSubjects = listOf("no subject", "NoSubject")
return if (uselessSubjects.contains(subject)) "" else subject
}
diff --git a/presentation/build.gradle b/presentation/build.gradle
index 7eedb0ba..6cd53a72 100644
--- a/presentation/build.gradle
+++ b/presentation/build.gradle
@@ -13,8 +13,8 @@ android {
applicationId "com.moez.QKSMS"
minSdkVersion 21
targetSdkVersion 27
- versionCode 158
- versionName "3.0.4"
+ versionCode 160
+ versionName "3.0.6"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
buildConfigField "String", "AMPLITUDE_API_KEY", "\"${System.getenv("AMPLITUDE_API_KEY")}\""
diff --git a/presentation/src/main/java/common/QKApplication.kt b/presentation/src/main/java/common/QKApplication.kt
index b4c4a230..914352c7 100644
--- a/presentation/src/main/java/common/QKApplication.kt
+++ b/presentation/src/main/java/common/QKApplication.kt
@@ -1,4 +1,6 @@
-package common/*
+package common
+
+/*
* Copyright (C) 2017 Moez Bhatti
*
* This file is part of QKSMS.
@@ -23,6 +25,7 @@ import android.support.v4.provider.FontRequest
import com.bugsnag.android.Bugsnag
import com.moez.QKSMS.BuildConfig
import com.moez.QKSMS.R
+import common.util.NightModeManager
import injection.AppComponentManager
import injection.appComponent
import io.realm.Realm
@@ -39,14 +42,19 @@ class QKApplication : Application() {
@Suppress("unused")
@Inject lateinit var analyticsManager: AnalyticsManager
+ @Inject lateinit var nightModeManager: NightModeManager
+
override fun onCreate() {
super.onCreate()
Bugsnag.init(this, BuildConfig.BUGSNAG_API_KEY)
+ Bugsnag.setAppVersion(BuildConfig.VERSION_NAME)
AppComponentManager.init(this)
appComponent.inject(this)
+ nightModeManager.updateCurrentTheme()
+
Realm.init(this)
Realm.setDefaultConfiguration(RealmConfiguration.Builder()
.compactOnLaunch()
diff --git a/presentation/src/main/java/common/base/QkActivity.kt b/presentation/src/main/java/common/base/QkActivity.kt
index f0729cd5..bb618130 100644
--- a/presentation/src/main/java/common/base/QkActivity.kt
+++ b/presentation/src/main/java/common/base/QkActivity.kt
@@ -74,4 +74,8 @@ abstract class QkActivity> : AppCompatActivity() {
return result
}
+ protected fun showBackButton(show: Boolean) {
+ supportActionBar?.setDisplayHomeAsUpEnabled(show)
+ }
+
}
\ No newline at end of file
diff --git a/presentation/src/main/java/common/util/NotificationManagerImpl.kt b/presentation/src/main/java/common/util/NotificationManagerImpl.kt
index e5d088e6..86ef4bb0 100644
--- a/presentation/src/main/java/common/util/NotificationManagerImpl.kt
+++ b/presentation/src/main/java/common/util/NotificationManagerImpl.kt
@@ -27,11 +27,13 @@ import android.content.Intent
import android.graphics.Color
import android.net.Uri
import android.os.Build
+import android.os.Parcel
import android.support.v4.app.NotificationCompat
import android.support.v4.app.NotificationManagerCompat
import android.support.v4.app.RemoteInput
import android.support.v4.app.TaskStackBuilder
import android.telephony.PhoneNumberUtils
+import android.widget.RemoteViews
import com.moez.QKSMS.R
import common.util.extensions.dpToPx
import feature.compose.ComposeActivity
@@ -95,13 +97,6 @@ class NotificationManagerImpl @Inject constructor(
val conversation = messageRepo.getConversation(threadId) ?: return
- // If QK Reply is enabled, use the default importance so that we don't have a notification
- // card in addition to the popup. Otherwise, use max importance
- val importance = when (prefs.qkreply.get()) {
- true -> NotificationManagerCompat.IMPORTANCE_DEFAULT
- false -> NotificationManagerCompat.IMPORTANCE_MAX
- }
-
val style = NotificationCompat.MessagingStyle("Me")
messages.forEach { message ->
val name = if (message.isMe()) null else conversation.getTitle()
@@ -135,7 +130,7 @@ class NotificationManagerImpl @Inject constructor(
val notification = NotificationCompat.Builder(context, getChannelIdForNotification(threadId))
.setCategory(NotificationCompat.CATEGORY_MESSAGE)
.setColor(colors.themeForConversation(threadId).blockingFirst())
- .setPriority(importance)
+ .setPriority(NotificationManagerCompat.IMPORTANCE_MAX)
.setLargeIcon(avatar)
.setSmallIcon(R.drawable.ic_notification)
.setNumber(messages.size)
@@ -156,9 +151,17 @@ class NotificationManagerImpl @Inject constructor(
if (Build.VERSION.SDK_INT >= 24) {
notification.addAction(getReplyAction(conversation.recipients[0]?.address.orEmpty(), threadId))
+ } else {
+ val replyIntent = Intent(context, QkReplyActivity::class.java).putExtra("threadId", threadId)
+ val replyPI = PendingIntent.getActivity(context, threadId.toInt() + 40000, replyIntent, PendingIntent.FLAG_UPDATE_CURRENT)
+ val replyAction = NotificationCompat.Action(R.drawable.ic_reply_white_24dp, context.getString(R.string.notification_reply), replyPI)
+ notification.addAction(replyAction)
}
if (prefs.qkreply.get()) {
+ // Needed in order to disable the heads up notification
+ notification.setCustomHeadsUpContentView(RemoteViews(Parcel.obtain()))
+
val intent = Intent(context, QkReplyActivity::class.java)
.putExtra("threadId", threadId)
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
diff --git a/presentation/src/main/java/common/util/extensions/ContextExtensions.kt b/presentation/src/main/java/common/util/extensions/ContextExtensions.kt
index 85cb4db4..0f042ef3 100644
--- a/presentation/src/main/java/common/util/extensions/ContextExtensions.kt
+++ b/presentation/src/main/java/common/util/extensions/ContextExtensions.kt
@@ -18,9 +18,11 @@
*/
package common.util.extensions
+import android.app.Activity
import android.content.Context
import android.support.annotation.StringRes
import android.support.v4.content.ContextCompat
+import android.view.inputmethod.InputMethodManager
import android.widget.Toast
fun Context.getColorCompat(colorRes: Int): Int {
@@ -33,4 +35,13 @@ fun Context.makeToast(@StringRes res: Int, duration: Int = Toast.LENGTH_SHORT) {
fun Context.makeToast(text: String, duration: Int = Toast.LENGTH_SHORT) {
Toast.makeText(this, text, duration).show()
+}
+
+fun Activity.dismissKeyboard() {
+ window.currentFocus?.let { focus ->
+ val imm = getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
+ imm.hideSoftInputFromWindow(focus.windowToken, 0)
+
+ focus.clearFocus()
+ }
}
\ No newline at end of file
diff --git a/presentation/src/main/java/common/util/extensions/ViewExtensions.kt b/presentation/src/main/java/common/util/extensions/ViewExtensions.kt
index 13ade72b..e0fe0507 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/util/filter/ContactFilter.kt b/presentation/src/main/java/common/util/filter/ContactFilter.kt
index 122311c4..f108ad6e 100644
--- a/presentation/src/main/java/common/util/filter/ContactFilter.kt
+++ b/presentation/src/main/java/common/util/filter/ContactFilter.kt
@@ -19,12 +19,13 @@
package common.util.filter
import model.Contact
+import util.extensions.removeAccents
import javax.inject.Inject
class ContactFilter @Inject constructor(private val phoneNumberFilter: PhoneNumberFilter) : Filter() {
override fun filter(item: Contact, query: CharSequence): Boolean {
- return item.name.contains(query, true) || // Name
+ return item.name.removeAccents().contains(query, true) || // Name
item.numbers.map { it.address }.any { address -> phoneNumberFilter.filter(address, query) } // Number
}
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/blocked/BlockedActivity.kt b/presentation/src/main/java/feature/blocked/BlockedActivity.kt
index 5619b8b9..5f009aae 100644
--- a/presentation/src/main/java/feature/blocked/BlockedActivity.kt
+++ b/presentation/src/main/java/feature/blocked/BlockedActivity.kt
@@ -49,7 +49,7 @@ class BlockedActivity : QkThemedActivity(), BlockedView {
super.onCreate(savedInstanceState)
setContentView(R.layout.blocked_activity)
setTitle(R.string.blocked_title)
- supportActionBar?.setDisplayHomeAsUpEnabled(true)
+ showBackButton(true)
viewModel.bindView(this)
colors.background
diff --git a/presentation/src/main/java/feature/compose/ComposeActivity.kt b/presentation/src/main/java/feature/compose/ComposeActivity.kt
index b1a04d20..644229e5 100644
--- a/presentation/src/main/java/feature/compose/ComposeActivity.kt
+++ b/presentation/src/main/java/feature/compose/ComposeActivity.kt
@@ -24,6 +24,7 @@ import android.graphics.PorterDuff
import android.net.Uri
import android.os.Bundle
import android.support.v7.widget.LinearLayoutManager
+import android.support.v7.widget.RecyclerView
import android.view.KeyEvent
import android.view.Menu
import android.view.MenuItem
@@ -33,8 +34,10 @@ import com.jakewharton.rxbinding2.widget.textChanges
import com.moez.QKSMS.R
import com.uber.autodispose.android.lifecycle.scope
import com.uber.autodispose.kotlin.autoDisposable
+import common.MenuItemAdapter
import common.base.QkThemedActivity
import common.util.extensions.autoScrollToStart
+import common.util.extensions.dpToPx
import common.util.extensions.setBackgroundTint
import common.util.extensions.setTint
import common.util.extensions.setVisible
@@ -61,10 +64,9 @@ class ComposeActivity : QkThemedActivity(), ComposeView {
override val menuReadyIntent: Observable = menu.map { Unit }
override val callIntent: Subject = PublishSubject.create()
override val infoIntent: Subject = PublishSubject.create()
- override val copyTextIntent: Subject = PublishSubject.create()
- override val forwardMessageIntent: Subject = PublishSubject.create()
- override val deleteMessageIntent: Subject = PublishSubject.create()
override val messageClickIntent: Subject by lazy { messageAdapter.clicks }
+ override val messageLongClickIntent: Subject by lazy { messageAdapter.longClicks }
+ override val menuItemIntent: Subject by lazy { menuItemAdapter.menuItemClicks }
override val attachmentDeletedIntent: Subject by lazy { attachmentAdapter.attachmentDeleted }
override val textChangedIntent by lazy { message.textChanges() }
override val attachIntent by lazy { attach.clicks() }
@@ -73,6 +75,7 @@ class ComposeActivity : QkThemedActivity(), ComposeView {
@Inject lateinit var chipsAdapter: ChipsAdapter
@Inject lateinit var contactsAdapter: ContactAdapter
@Inject lateinit var messageAdapter: MessagesAdapter
+ @Inject lateinit var menuItemAdapter: MenuItemAdapter
@Inject lateinit var attachmentAdapter: AttachmentAdapter
init {
@@ -82,7 +85,7 @@ class ComposeActivity : QkThemedActivity(), ComposeView {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.compose_activity)
- supportActionBar?.setDisplayHomeAsUpEnabled(true)
+ showBackButton(true)
viewModel.bindView(this)
chipsAdapter.view = chips
@@ -94,17 +97,7 @@ class ComposeActivity : QkThemedActivity(), ComposeView {
val layoutManager = LinearLayoutManager(this).apply { stackFromEnd = true }
messageAdapter.autoScrollToStart(messageList)
- messageAdapter.longClicks.subscribe { message ->
- AlertDialog.Builder(this)
- .setItems(R.array.message_options, { _, row ->
- when (row) {
- 0 -> copyTextIntent.onNext(message)
- 1 -> forwardMessageIntent.onNext(message)
- 2 -> deleteMessageIntent.onNext(message)
- }
- })
- .show()
- }
+ messageAdapter.emptyView = messagesEmpty
messageList.setHasFixedSize(true)
messageList.layoutManager = layoutManager
@@ -211,6 +204,23 @@ class ComposeActivity : QkThemedActivity(), ComposeView {
message.setText(draft)
}
+ override fun showMenu(menuItems: List) {
+ val recyclerView = RecyclerView(this)
+ recyclerView.layoutManager = LinearLayoutManager(this)
+ recyclerView.adapter = menuItemAdapter
+ recyclerView.setPadding(0, 8.dpToPx(this), 0, 8.dpToPx(this))
+
+ val dialog = AlertDialog.Builder(this)
+ .setView(recyclerView)
+ .create()
+ .apply { show() }
+
+ menuItemAdapter.data = menuItems
+ menuItemAdapter.menuItemClicks
+ .autoDisposable(scope())
+ .subscribe { dialog.dismiss() }
+ }
+
override fun onCreateOptionsMenu(menu: Menu?): Boolean {
menuInflater.inflate(R.menu.compose, menu)
return super.onCreateOptionsMenu(menu)
diff --git a/presentation/src/main/java/feature/compose/ComposeView.kt b/presentation/src/main/java/feature/compose/ComposeView.kt
index 069ede65..5e2f9beb 100644
--- a/presentation/src/main/java/feature/compose/ComposeView.kt
+++ b/presentation/src/main/java/feature/compose/ComposeView.kt
@@ -20,11 +20,12 @@ package feature.compose
import android.net.Uri
import android.view.KeyEvent
+import common.MenuItem
+import common.base.QkView
import io.reactivex.Observable
import io.reactivex.subjects.Subject
import model.Contact
import model.Message
-import common.base.QkView
interface ComposeView : QkView {
@@ -37,15 +38,15 @@ interface ComposeView : QkView {
val menuReadyIntent: Observable
val callIntent: Subject
val infoIntent: Subject
- val copyTextIntent: Subject
- val forwardMessageIntent: Subject
- val deleteMessageIntent: Subject
val messageClickIntent: Subject
+ val messageLongClickIntent: Subject
+ val menuItemIntent: Subject
val attachmentDeletedIntent: Subject
val textChangedIntent: Observable
val attachIntent: Observable
val sendIntent: Observable
+ fun showMenu(menuItems: List