From 0341e92e885b939b062331aeb6a09ab2cfb7ceb1 Mon Sep 17 00:00:00 2001 From: Daniel Date: Mon, 7 Sep 2015 21:21:08 -0400 Subject: [PATCH 1/2] Small refactoring --- .../QKSMS/common/emoji/EmojiRegistry.java | 45 ++++++++++--------- .../com/moez/QKSMS/common/emoji/Emojis.java | 3 ++ .../java/com/moez/QKSMS/data/Contact.java | 1 + .../com/moez/QKSMS/data/ContactHelper.java | 2 +- .../java/com/moez/QKSMS/data/Message.java | 6 +-- 5 files changed, 31 insertions(+), 26 deletions(-) diff --git a/QKSMS/src/main/java/com/moez/QKSMS/common/emoji/EmojiRegistry.java b/QKSMS/src/main/java/com/moez/QKSMS/common/emoji/EmojiRegistry.java index d214e654..3189590a 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/common/emoji/EmojiRegistry.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/common/emoji/EmojiRegistry.java @@ -38,28 +38,29 @@ public class EmojiRegistry { public static String parseEmojis(String body) { if (TextUtils.isEmpty(body)) { return body; - } else { - // whitespace and punctuation characters - String ACCEPTED_CHARS = "[\\s.,?:;'\"!]"; - - // explanation: we want to match: - // 1) either an accepted char or the beginning of the text (i.e. ^) - // 2) the actual emoji code (to be inserted in the loop) - // 3) either an accepted char or the end of the text (i.e. $) - String REGEX_TEMPLATE = String.format("(^|%s)%s(%s|$)", ACCEPTED_CHARS, "%s", ACCEPTED_CHARS); - - // iterate over all the entries - for (Map.Entry entry : EmojiRegistry.EMOJIS_MAP.entrySet()) { - // quote the emoji code because some characters like ) are protected in regex land - String quoted = Pattern.quote(entry.getKey()); - String regex = String.format(REGEX_TEMPLATE, quoted); - - // the $1 and $2 represent the character* that came before the emoji and the - // character* that came after the emoji - // * - or beginning / end of text - body = body.replaceAll(regex, "$1:" + entry.getValue() + ":$2"); - } - return EmojiParser.parseToUnicode(body); } + + // whitespace and punctuation characters + String ACCEPTED_CHARS = "[\\s.,?:;'\"!]"; + + // explanation: we want to match: + // 1) either an accepted char or the beginning of the text (i.e. ^) + // 2) the actual emoji code (to be inserted in the loop) + // 3) either an accepted char or the end of the text (i.e. $) + String REGEX_TEMPLATE = String.format("(^|%s)%s(%s|$)", ACCEPTED_CHARS, "%s", ACCEPTED_CHARS); + + // iterate over all the entries + for (Map.Entry entry : EmojiRegistry.EMOJIS_MAP.entrySet()) { + // quote the emoji code because some characters like ) are protected in regex land + String quoted = Pattern.quote(entry.getKey()); + String regex = String.format(REGEX_TEMPLATE, quoted); + + // the $1 and $2 represent the character* that came before the emoji and the + // character* that came after the emoji + // * - or beginning / end of text + body = body.replaceAll(regex, "$1:" + entry.getValue() + ":$2"); + } + + return EmojiParser.parseToUnicode(body); } } diff --git a/QKSMS/src/main/java/com/moez/QKSMS/common/emoji/Emojis.java b/QKSMS/src/main/java/com/moez/QKSMS/common/emoji/Emojis.java index a6680036..3e6cade1 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/common/emoji/Emojis.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/common/emoji/Emojis.java @@ -1,5 +1,8 @@ package com.moez.QKSMS.common.emoji; +/** + * Defines all supported emojis + */ public class Emojis { public static final String SMILE = "smile"; public static final String SMILEY = "smiley"; diff --git a/QKSMS/src/main/java/com/moez/QKSMS/data/Contact.java b/QKSMS/src/main/java/com/moez/QKSMS/data/Contact.java index 53454894..23f4ecbb 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/data/Contact.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/data/Contact.java @@ -122,6 +122,7 @@ public class Contact { mIsStale = true; mSendToVoicemail = false; } + @Override public String toString() { return String.format("{ number=%s, name=%s, nameAndNumber=%s, label=%s, person_id=%d, hash=%d method_id=%d }", diff --git a/QKSMS/src/main/java/com/moez/QKSMS/data/ContactHelper.java b/QKSMS/src/main/java/com/moez/QKSMS/data/ContactHelper.java index dd382386..749ac598 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/data/ContactHelper.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/data/ContactHelper.java @@ -192,7 +192,7 @@ public class ContactHelper { return bitmap; } - + public static Bitmap blankContact(Context context, String name) { String text = name == null || PhoneNumberUtils.isWellFormedSmsAddress(PhoneNumberUtils.stripSeparators(name)) || name.length() == 0 ? "#" : "" + name.toUpperCase().charAt(0); diff --git a/QKSMS/src/main/java/com/moez/QKSMS/data/Message.java b/QKSMS/src/main/java/com/moez/QKSMS/data/Message.java index baf3db9e..0590289d 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/data/Message.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/data/Message.java @@ -82,12 +82,12 @@ public class Message { } public boolean isMms() { - boolean bool = false; + boolean isMms = false; Cursor cursor = null; try { cursor = context.getContentResolver().query(MMS_SMS_CONTENT_PROVIDER, new String[]{SmsHelper.COLUMN_MMS}, "_id=" + id, null, null); cursor.moveToFirst(); - bool = "application/vnd.wap.multipart.related".equals(cursor.getString(cursor.getColumnIndex(SmsHelper.COLUMN_MMS))); + isMms = "application/vnd.wap.multipart.related".equals(cursor.getString(cursor.getColumnIndex(SmsHelper.COLUMN_MMS))); } catch (Exception e) { e.printStackTrace(); } finally { @@ -95,7 +95,7 @@ public class Message { cursor.close(); } } - return bool; + return isMms; } public String getAddress() { From ad2adc0cd60b3b2fd5f2a03f952208d3238b408f Mon Sep 17 00:00:00 2001 From: Daniel Christopher Date: Mon, 14 Sep 2015 20:07:55 -0400 Subject: [PATCH 2/2] Update ContactHelper.java --- QKSMS/src/main/java/com/moez/QKSMS/data/ContactHelper.java | 1 - 1 file changed, 1 deletion(-) diff --git a/QKSMS/src/main/java/com/moez/QKSMS/data/ContactHelper.java b/QKSMS/src/main/java/com/moez/QKSMS/data/ContactHelper.java index 749ac598..7dd62c47 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/data/ContactHelper.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/data/ContactHelper.java @@ -189,7 +189,6 @@ public class ContactHelper { } catch (IOException e) { e.printStackTrace(); } - return bitmap; }