Issue nodejs#168 bugfix for links not being clickable, adds autoLink …

…feature including web, phone, map and email
minervapanda · Sep 10, 2016 · 263e874 · 263e874
1 parent e370c9b
commit 263e874
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/app/src/main/java/com/zulip/android/models/Message.java b/app/src/main/java/com/zulip/android/models/Message.java
@@ -42,6 +42,8 @@
 import java.util.Map;
 import java.util.concurrent.Callable;
 
+import static com.zulip.android.util.CustomHtmlToSpannedConverter.linkifySpanned;
+
 @DatabaseTable(tableName = "messages")
 public class Message {
 

diff --git a/app/src/main/java/com/zulip/android/util/CustomHtmlToSpannedConverter.java b/app/src/main/java/com/zulip/android/util/CustomHtmlToSpannedConverter.java
@@ -24,7 +24,10 @@
 import android.graphics.Typeface;
 import android.graphics.drawable.Drawable;
 import android.support.annotation.NonNull;
+<<<<<<< e370c9bc00e8f6b33b1d12a44b4c70a7f063c8b9
 import android.support.v4.content.ContextCompat;
+=======
+>>>>>>> Issue #168 bugfix for links not being clickable, adds autoLink feature including web, phone, map and email
 import android.text.Html;
 import android.text.Layout;
 import android.text.Spannable;
@@ -730,7 +733,11 @@ private static int convertValueToInt(CharSequence charSeq,
     }
 
     /**
+<<<<<<< e370c9bc00e8f6b33b1d12a44b4c70a7f063c8b9
      * Parses Spanned text for existing html links and reapplies them after the text has been Linkified
+=======
+     * Parses Spanned text for existing html links and reapplies them.
+>>>>>>> Issue #168 bugfix for links not being clickable, adds autoLink feature including web, phone, map and email
      * @see <a href="https://developer.android.com/reference/android/text/util/Linkify.html">Linkify</a>
      *
      * @param spann