Merge branch 'master' into per-contact-colors

This commit is contained in:
Moez Bhatti
2015-12-25 14:57:29 -05:00
3 changed files with 196 additions and 58 deletions
@@ -0,0 +1,111 @@
package com.moez.QKSMS.common.utils;
import android.content.ActivityNotFoundException;
import android.content.Context;
import android.content.Intent;
import android.net.Uri;
import android.provider.Browser;
import android.text.Spannable;
import android.text.SpannableString;
import android.text.style.CharacterStyle;
import android.text.style.ClickableSpan;
import android.text.style.URLSpan;
import android.text.util.Linkify;
import android.text.util.Linkify.TransformFilter;
import android.util.Log;
import android.view.View;
import android.widget.TextView;
import java.util.regex.Pattern;
/**
* Shamelessly stolen from
* <a href="https://raw.githubusercontent.com/guardianproject/ChatSecureAndroid/master/src/info/guardianproject/util/LinkifyHelper.java">ChatSecure's implementation</a>
*/
public class LinkifyUtils {
private static Pattern bitcoin = Pattern.compile("bitcoin:[1-9a-km-zA-HJ-NP-Z]{27,34}(\\?[a-zA-Z0-9$\\-_.+!*'(),%:;@&=]*)?");
private static Pattern geo = Pattern.compile("geo:[-0-9.]+,[-0-9.]+[^ \t\n\"\':]*");
private static Pattern market = Pattern.compile("market://[^ \t\n\"\':,<>]+");
private static Pattern openpgp4fpr = Pattern.compile("openpgp4fpr:[A-Za-z0-9]{8,40}");
private static Pattern xmpp = Pattern.compile("xmpp:[^ \t\n\"\':,<>]+");
private static Pattern twitterHandle = Pattern.compile("@([A-Za-z0-9_-]+)");
private static Pattern hashtag = Pattern.compile("#([A-Za-z0-9_-]+)");
static TransformFilter returnMatchFilter = (match, url) -> match.group(1);
/* Right now, if there is no app to handle */
public static void addLinks(TextView text) {
Linkify.addLinks(text, Linkify.ALL);
Linkify.addLinks(text, geo, null);
Linkify.addLinks(text, market, null);
Linkify.addLinks(text, openpgp4fpr, null);
Linkify.addLinks(text, bitcoin, null);
Linkify.addLinks(text, xmpp, null);
Linkify.addLinks(text, twitterHandle, "https://twitter.com/", null, returnMatchFilter);
Linkify.addLinks(text, hashtag, "https://twitter.com/hashtag/", null, returnMatchFilter);
text.setText(replaceAll(text.getText(), URLSpan.class, new URLSpanConverter()));
}
/**
* Do not create this static utility class.
*/
private LinkifyUtils() {
}
// thanks to @commonsware https://stackoverflow.com/a/11417498
public static <A extends CharacterStyle, B extends CharacterStyle> Spannable replaceAll(
CharSequence original, Class<A> sourceType, SpanConverter<A, B> converter) {
SpannableString result = new SpannableString(original);
A[] spans = result.getSpans(0, result.length(), sourceType);
for (A span : spans) {
int start = result.getSpanStart(span);
int end = result.getSpanEnd(span);
int flags = result.getSpanFlags(span);
result.removeSpan(span);
result.setSpan(converter.convert(span), start, end, flags);
}
return (result);
}
private interface SpanConverter<A extends CharacterStyle, B extends CharacterStyle> {
B convert(A span);
}
/**
* This trickery is needed in order to have clickable links that open things
* in a new {@code Task} rather than in ChatSecure's {@code Task.} Thanks to @commonsware
* https://stackoverflow.com/a/11417498
*/
private static class NewTaskUrlSpan extends ClickableSpan {
private String urlString;
NewTaskUrlSpan(String urlString) {
this.urlString = urlString;
}
@Override
public void onClick(View widget) {
try {
Uri uri = Uri.parse(urlString);
Context context = widget.getContext();
Intent intent = new Intent(Intent.ACTION_VIEW, uri);
intent.putExtra(Browser.EXTRA_APPLICATION_ID, context.getPackageName());
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
context.startActivity(intent);
} catch (ActivityNotFoundException ignored) {
Log.e("LinkifyUtils", "", ignored); // We should (or shouldn't) explain that no app can handle this intent ?
}
}
}
private static class URLSpanConverter implements LinkifyUtils.SpanConverter<URLSpan, ClickableSpan> {
@Override
public NewTaskUrlSpan convert(URLSpan span) {
return (new NewTaskUrlSpan(span.getURL()));
}
}
}
@@ -20,12 +20,14 @@ package com.moez.QKSMS.model;
import android.content.Context;
import android.preference.PreferenceManager;
import android.util.Log;
import com.google.android.mms.ContentType;
import com.google.android.mms.MmsException;
import com.google.android.mms.pdu_alt.PduBody;
import com.google.android.mms.pdu_alt.PduPart;
import com.moez.QKSMS.LogTag;
import com.moez.QKSMS.MmsConfig;
import org.json.JSONArray;
import org.json.JSONObject;
import org.w3c.dom.smil.SMILMediaElement;
@@ -42,16 +44,17 @@ import java.util.Collections;
public class MediaModelFactory {
private static final String TAG = "Mms:media";
private static final boolean LOCAL_LOGV = false;
/**
* Returns the media model for the given SMILMediaElement in the PduBody.
*
* @param context
* @param sme The SMILMediaElement to find
* @param srcs
* @param layouts
* @param pb
* @return
* @param context Context
* @param sme The SMILMediaElement to find
* @param srcs String array of sources
* @param layouts LayoutModel
* @param pb PduBuddy
* @return MediaModel
* @throws IOException
* @throws IllegalArgumentException
* @throws MmsException
@@ -60,7 +63,7 @@ public class MediaModelFactory {
ArrayList<String> srcs, LayoutModel layouts,
PduBody pb)
throws IOException, IllegalArgumentException, MmsException {
throws IOException, IllegalArgumentException, MmsException {
String tag = sme.getTagName();
String src = sme.getSrc();
@@ -69,10 +72,10 @@ public class MediaModelFactory {
if (sme instanceof SMILRegionMediaElement) {
return getRegionMediaModel(
context, tag, src, (SMILRegionMediaElement) sme, layouts, part);
context, tag, src, (SMILRegionMediaElement) sme, layouts, part);
} else {
return getGenericMediaModel(
context, tag, src, sme, part, null);
context, tag, src, sme, part, null);
}
}
@@ -83,9 +86,9 @@ public class MediaModelFactory {
* Essentially, a SMIL MMS is formatted as follows:
*
* 1. A smil/application part, which contains XML-like formatting for images, text, audio,
* slideshows, videos, etc.
* slideshows, videos, etc.
* 2. One or more parts that correspond to one of the elements that was mentioned in the
* formatting above.
* formatting above.
*
* In the smil/application part, elements are identified by a "src" attribute in an XML-like
* element. The challenge of this method lies in the fact that sometimes, the src string isn't
@@ -93,7 +96,6 @@ public class MediaModelFactory {
*
* We employ several methods of pairing src strings up to parts, using certain patterns we've
* seen in failed MMS messages. These are described in this method.
*
* TODO TODO TODO: Create a testing suite for this!
*/
private static PduPart findPart(final Context context, PduBody pb, String src,
@@ -318,7 +320,17 @@ public class MediaModelFactory {
if (src == null) {
return -1;
} else {
return Long.parseLong(src.substring("cid:".length()));
if (LOCAL_LOGV) {
Log.v(TAG, "Initial contentId: " + src);
}
src = src.substring("cid:".length());
src = unescapeXML(src);
// Strip any leading < or trailing > ... they are present sometimes and causing error(s)
src = src.replaceAll("(^\\<)|(\\>$)", "");
if (LOCAL_LOGV) {
Log.v(TAG, "Final contentId: " + src);
}
return Long.parseLong(src);
}
}
@@ -347,16 +359,16 @@ public class MediaModelFactory {
}
private static String unescapeXML(String str) {
return str.replaceAll("&lt;","<")
return str.replaceAll("&lt;", "<")
.replaceAll("&gt;", ">")
.replaceAll("&quot;","\"")
.replaceAll("&apos;","'")
.replaceAll("&quot;", "\"")
.replaceAll("&apos;", "'")
.replaceAll("&amp;", "&");
}
private static MediaModel getRegionMediaModel(Context context,
String tag, String src, SMILRegionMediaElement srme,
LayoutModel layouts, PduPart part) throws IOException, MmsException {
String tag, String src, SMILRegionMediaElement srme,
LayoutModel layouts, PduPart part) throws IOException, MmsException {
SMILRegionElement sre = srme.getRegion();
if (sre != null) {
RegionModel region = layouts.findRegionById(sre.getId());
@@ -364,7 +376,7 @@ public class MediaModelFactory {
return getGenericMediaModel(context, tag, src, srme, part, region);
}
} else {
String rId = null;
String rId;
if (tag.equals(SmilHelper.ELEMENT_TAG_TEXT)) {
rId = LayoutModel.TEXT_REGION_ID;
@@ -383,54 +395,61 @@ public class MediaModelFactory {
// When we encounter a content type we can't handle, such as "application/vnd.smaf", instead
// of throwing an exception and crashing, insert an empty TextModel in its place.
private static MediaModel createEmptyTextModel(Context context, RegionModel regionModel)
throws IOException {
private static MediaModel createEmptyTextModel(Context context, RegionModel regionModel)
throws IOException {
return new TextModel(context, ContentType.TEXT_PLAIN, null, regionModel);
}
private static MediaModel getGenericMediaModel(Context context,
String tag, String src, SMILMediaElement sme, PduPart part,
RegionModel regionModel) throws IOException, MmsException {
String tag, String src, SMILMediaElement sme, PduPart part,
RegionModel regionModel) throws IOException, MmsException {
byte[] bytes = part.getContentType();
if (bytes == null) {
throw new IllegalArgumentException(
"Content-Type of the part may not be null.");
"Content-Type of the part may not be null.");
}
String contentType = new String(bytes);
MediaModel media = null;
if (tag.equals(SmilHelper.ELEMENT_TAG_TEXT)) {
media = new TextModel(context, contentType, src,
part.getCharset(), part.getData(), regionModel);
} else if (tag.equals(SmilHelper.ELEMENT_TAG_IMAGE)) {
media = new ImageModel(context, contentType, src,
part.getDataUri(), regionModel);
} else if (tag.equals(SmilHelper.ELEMENT_TAG_VIDEO)) {
media = new VideoModel(context, contentType, src,
part.getDataUri(), regionModel);
} else if (tag.equals(SmilHelper.ELEMENT_TAG_AUDIO)) {
media = new AudioModel(context, contentType, src,
part.getDataUri());
} else if (tag.equals(SmilHelper.ELEMENT_TAG_REF)) {
if (ContentType.isTextType(contentType)) {
MediaModel media;
switch (tag) {
case SmilHelper.ELEMENT_TAG_TEXT:
media = new TextModel(context, contentType, src,
part.getCharset(), part.getData(), regionModel);
} else if (ContentType.isImageType(contentType)) {
part.getCharset(), part.getData(), regionModel);
break;
case SmilHelper.ELEMENT_TAG_IMAGE:
media = new ImageModel(context, contentType, src,
part.getDataUri(), regionModel);
} else if (ContentType.isVideoType(contentType)) {
part.getDataUri(), regionModel);
break;
case SmilHelper.ELEMENT_TAG_VIDEO:
media = new VideoModel(context, contentType, src,
part.getDataUri(), regionModel);
} else if (ContentType.isAudioType(contentType)) {
part.getDataUri(), regionModel);
break;
case SmilHelper.ELEMENT_TAG_AUDIO:
media = new AudioModel(context, contentType, src,
part.getDataUri());
break;
case SmilHelper.ELEMENT_TAG_REF:
if (ContentType.isTextType(contentType)) {
media = new TextModel(context, contentType, src,
part.getCharset(), part.getData(), regionModel);
} else if (ContentType.isImageType(contentType)) {
media = new ImageModel(context, contentType, src,
part.getDataUri(), regionModel);
} else if (ContentType.isVideoType(contentType)) {
media = new VideoModel(context, contentType, src,
part.getDataUri(), regionModel);
} else if (ContentType.isAudioType(contentType)) {
media = new AudioModel(context, contentType, src,
part.getDataUri());
} else {
Log.d(TAG, "[MediaModelFactory] getGenericMediaModel Unsupported Content-Type: "
} else {
Log.d(TAG, "[MediaModelFactory] getGenericMediaModel Unsupported Content-Type: "
+ contentType);
media = createEmptyTextModel(context, regionModel);
}
} else {
throw new IllegalArgumentException("Unsupported TAG: " + tag);
media = createEmptyTextModel(context, regionModel);
}
break;
default:
throw new IllegalArgumentException("Unsupported TAG: " + tag);
}
// Set 'begin' property.
@@ -453,12 +472,10 @@ public class MediaModelFactory {
if (t.getTimeType() != Time.SMIL_TIME_INDEFINITE) {
duration = (int) (t.getResolvedOffset() * 1000) - begin;
if (duration == 0 &&
(media instanceof AudioModel || media instanceof VideoModel)) {
if (duration == 0 && (media instanceof AudioModel || media instanceof VideoModel)) {
duration = MmsConfig.getMinimumSlideElementDuration();
if (Log.isLoggable(LogTag.APP, Log.VERBOSE)) {
Log.d(TAG, "[MediaModelFactory] compute new duration for " + tag +
", duration=" + duration);
if (Log.isLoggable(TAG, Log.VERBOSE)) {
Log.v(TAG, "[MediaModelFactory] compute new duration for " + tag + ", duration=" + duration);
}
}
}
@@ -474,7 +491,7 @@ public class MediaModelFactory {
* If not, the media will disappear while rotating the screen
* in the slide show play view.
*/
media.setFill(sme.FILL_FREEZE);
media.setFill(SMILMediaElement.FILL_FREEZE);
} else {
// Set 'fill' property.
media.setFill(sme.getFill());
@@ -14,12 +14,16 @@ import android.telephony.TelephonyManager;
import android.text.SpannableString;
import android.text.SpannableStringBuilder;
import android.text.TextUtils;
import android.text.style.ClickableSpan;
import android.text.style.StyleSpan;
import android.text.style.URLSpan;
import android.text.style.UnderlineSpan;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.RelativeLayout;
import com.android.mms.transaction.Transaction;
import com.android.mms.transaction.TransactionBundle;
import com.android.mms.transaction.TransactionService;
@@ -30,6 +34,7 @@ import com.moez.QKSMS.QKSMSApp;
import com.moez.QKSMS.R;
import com.moez.QKSMS.common.emoji.EmojiRegistry;
import com.moez.QKSMS.common.utils.CursorUtils;
import com.moez.QKSMS.common.utils.LinkifyUtils;
import com.moez.QKSMS.common.utils.MessageUtils;
import com.moez.QKSMS.data.Contact;
import com.moez.QKSMS.transaction.SmsHelper;
@@ -39,6 +44,7 @@ import com.moez.QKSMS.ui.base.RecyclerCursorAdapter;
import com.moez.QKSMS.ui.mms.MmsThumbnailPresenter;
import com.moez.QKSMS.ui.settings.SettingsFragment;
import com.moez.QKSMS.ui.view.AvatarView;
import ezvcard.Ezvcard;
import ezvcard.VCard;
@@ -323,6 +329,7 @@ public class MessageListAdapter extends RecyclerCursorAdapter<MessageListViewHol
}
private void bindBody(MessageListViewHolder holder, MessageItem messageItem) {
holder.mBodyTextView.setAutoLinkMask(0);
SpannableStringBuilder buf = new SpannableStringBuilder();
String body = messageItem.mBody;
@@ -357,7 +364,10 @@ public class MessageListAdapter extends RecyclerCursorAdapter<MessageListViewHol
}
}
holder.mBodyTextView.setText(buf);
if (!TextUtils.isEmpty(buf)) {
holder.mBodyTextView.setText(buf);
LinkifyUtils.addLinks(holder.mBodyTextView);
}
holder.mBodyTextView.setVisibility(TextUtils.isEmpty(buf) ? View.GONE : View.VISIBLE);
}