From 0c9cc5554657aa176bf3d831edf1563dda32aa14 Mon Sep 17 00:00:00 2001 From: BernardLePro Date: Wed, 16 Sep 2015 13:28:02 +0200 Subject: [PATCH] Fix for qklabs/qksms#99 --- .../QKSMS/common/formatter/Formatter.java | 5 +++ .../common/formatter/FormatterFactory.java | 12 ++++++ .../formatter/NumberToContactFormatter.java | 43 +++++++++++++++++++ .../java/com/moez/QKSMS/data/Contact.java | 4 ++ .../QKSMS/ui/messagelist/MessageItem.java | 2 + 5 files changed, 66 insertions(+) create mode 100644 QKSMS/src/main/java/com/moez/QKSMS/common/formatter/Formatter.java create mode 100644 QKSMS/src/main/java/com/moez/QKSMS/common/formatter/FormatterFactory.java create mode 100644 QKSMS/src/main/java/com/moez/QKSMS/common/formatter/NumberToContactFormatter.java diff --git a/QKSMS/src/main/java/com/moez/QKSMS/common/formatter/Formatter.java b/QKSMS/src/main/java/com/moez/QKSMS/common/formatter/Formatter.java new file mode 100644 index 00000000..c1199f34 --- /dev/null +++ b/QKSMS/src/main/java/com/moez/QKSMS/common/formatter/Formatter.java @@ -0,0 +1,5 @@ +package com.moez.QKSMS.common.formatter; + +public interface Formatter { + String format(String text); +} diff --git a/QKSMS/src/main/java/com/moez/QKSMS/common/formatter/FormatterFactory.java b/QKSMS/src/main/java/com/moez/QKSMS/common/formatter/FormatterFactory.java new file mode 100644 index 00000000..fa587f10 --- /dev/null +++ b/QKSMS/src/main/java/com/moez/QKSMS/common/formatter/FormatterFactory.java @@ -0,0 +1,12 @@ +package com.moez.QKSMS.common.formatter; + +public class FormatterFactory { + private static final Formatter[] FORMATTERS = {new NumberToContactFormatter()}; + + public static String format(String text) { + for (Formatter formatter : FORMATTERS) { + text = formatter.format(text); + } + return text; + } +} diff --git a/QKSMS/src/main/java/com/moez/QKSMS/common/formatter/NumberToContactFormatter.java b/QKSMS/src/main/java/com/moez/QKSMS/common/formatter/NumberToContactFormatter.java new file mode 100644 index 00000000..bb1bbece --- /dev/null +++ b/QKSMS/src/main/java/com/moez/QKSMS/common/formatter/NumberToContactFormatter.java @@ -0,0 +1,43 @@ +package com.moez.QKSMS.common.formatter; + +import android.content.Context; +import android.telephony.TelephonyManager; + +import com.google.i18n.phonenumbers.PhoneNumberMatch; +import com.google.i18n.phonenumbers.PhoneNumberUtil; +import com.google.i18n.phonenumbers.PhoneNumberUtil.PhoneNumberFormat; +import com.moez.QKSMS.QKSMSAppBase; +import com.moez.QKSMS.data.Contact; + +public class NumberToContactFormatter implements Formatter { + String mCountryIso; + + @Override + public String format(String text) { + PhoneNumberUtil phoneNumberUtil = PhoneNumberUtil.getInstance(); + Iterable matches = phoneNumberUtil.findNumbers(text, getCurrentCountryIso()); + for (PhoneNumberMatch match : matches) { + Contact contact = Contact.get(match.rawString(), true); + if (contact.isNamed()) { + String nameAndNumber = phoneNumberUtil.format(match.number(), PhoneNumberFormat.NATIONAL) + + " (" + contact.getName() + ")"; + text = text.replace(match.rawString(), nameAndNumber); + } // If the contact doesn't exist yet, leave the number as-is + } + return text; + } + + public String getCurrentCountryIso() { + if (mCountryIso == null) { + TelephonyManager tm = (TelephonyManager) QKSMSAppBase.getApplication().getSystemService(Context.TELEPHONY_SERVICE); + mCountryIso = tm.getNetworkCountryIso(); + // Just in case the TelephonyManager method failed, fallback to US + if (mCountryIso == null) { + mCountryIso = "US"; + } + mCountryIso = mCountryIso.toUpperCase(); + } + return mCountryIso; + } + +} 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..15508205 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/data/Contact.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/data/Contact.java @@ -260,6 +260,10 @@ public class Contact { } } + public synchronized boolean isNamed() { + return !TextUtils.isEmpty(mName); + } + public synchronized String getNameAndNumber() { return mNameAndNumber; } diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageItem.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageItem.java index ba01de16..a9fefb33 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageItem.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageItem.java @@ -39,6 +39,7 @@ import com.google.android.mms.pdu_alt.RetrieveConf; import com.google.android.mms.pdu_alt.SendReq; import com.moez.QKSMS.QKSMSApp; import com.moez.QKSMS.R; +import com.moez.QKSMS.common.formatter.FormatterFactory; import com.moez.QKSMS.data.Contact; import com.moez.QKSMS.model.SlideModel; import com.moez.QKSMS.model.SlideshowModel; @@ -152,6 +153,7 @@ public class MessageItem { mContact = Contact.get(mAddress, canBlock).getName(); } mBody = cursor.getString(columnsMap.mColumnSmsBody); + mBody = FormatterFactory.format(mBody); // Unless the message is currently in the progress of being sent, it gets a time stamp. if (!isOutgoingMessage()) {