Handle new data-user-id for clickable spans.

Author: Sam1301

app/src/main/java/com/zulip/android/util/CustomHtmlToSpannedConverter.java

@@ -48,6 +48,7 @@
 
 import com.zulip.android.R;
 import com.zulip.android.ZulipApp;
+import com.zulip.android.models.Person;
 
 import org.ccil.cowan.tagsoup.Parser;
 import org.xml.sax.Attributes;
@@ -64,6 +65,8 @@
 import java.util.List;
 import java.util.Locale;
 
+import static android.R.attr.id;
+
 public class CustomHtmlToSpannedConverter implements ContentHandler {
 
     private static final float[] HEADER_SIZES = {1.5f, 1.4f, 1.3f, 1.2f, 1.1f,
@@ -233,7 +236,16 @@ private static void endFont(SpannableStringBuilder text) {
     }
 
     private static void startSpan(SpannableStringBuilder text, Attributes attributes) {
-        String email = attributes.getValue("data-user-email");
+        String email;
+        String stringId = attributes.getValue("data-user-id");
+        if (stringId != null) {
+            int id = Integer.parseInt(stringId);
+            email = Person.getById(ZulipApp.get(), id).getEmail();
+        } else {
+            // for historical messages
+            email = attributes.getValue("data-user-email");
+        }
+
         int len = text.length();
         text.setSpan(new Href(email), len, len, Spannable.SPAN_MARK_MARK);
     }