Commit f55f9761 authored by Tiago Cunha's avatar Tiago Cunha

Codacy feedback

parent 398a1fa9
...@@ -5,17 +5,12 @@ import android.content.Context; ...@@ -5,17 +5,12 @@ import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.net.Uri; import android.net.Uri;
import android.os.Build; import android.os.Build;
import android.support.graphics.drawable.VectorDrawableCompat;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.TextView; import android.widget.TextView;
import com.facebook.drawee.backends.pipeline.Fresco;
import com.facebook.drawee.drawable.ProgressBarDrawable;
import com.facebook.drawee.generic.GenericDraweeHierarchy;
import com.facebook.drawee.interfaces.DraweeController;
import com.facebook.drawee.view.SimpleDraweeView; import com.facebook.drawee.view.SimpleDraweeView;
import java.util.List; import java.util.List;
...@@ -76,19 +71,8 @@ public class RocketChatMessageUrlsLayout extends LinearLayout { ...@@ -76,19 +71,8 @@ public class RocketChatMessageUrlsLayout extends LinearLayout {
private void appendUrlView(WebContent webContent, boolean autoloadImages) { private void appendUrlView(WebContent webContent, boolean autoloadImages) {
final String url = webContent.getUrl(); final String url = webContent.getUrl();
final WebContentHeaders webContentHeaders = webContent.getHeaders();
String contentType = webContentHeaders != null ? webContentHeaders.getContentType() : "";
if (contentType != null && contentType.startsWith("image/")
&& ImageFormat.SUPPORTED_LIST.contains(contentType)) {
final View inlineImageView = inflater.inflate(R.layout.message_inline_image, this, false);
final SimpleDraweeView
inlineImage = (SimpleDraweeView) inlineImageView.findViewById(R.id.message_inline_image);
final View loadView = inlineImageView.findViewById(R.id.message_inline_image_load);
loadImage(url, inlineImage, loadView, autoloadImages); addMessageInlineImage(webContent, autoloadImages, url);
addView(inlineImageView);
}
// see Rocket.Chat:packages/rocketchat-oembed/client/oembedUrlWidget.coffee // see Rocket.Chat:packages/rocketchat-oembed/client/oembedUrlWidget.coffee
final Map<WebContentMeta.Type, WebContentMeta> webContentMetaMap = webContent.getMetaMap(); final Map<WebContentMeta.Type, WebContentMeta> webContentMetaMap = webContent.getMetaMap();
...@@ -96,18 +80,6 @@ public class RocketChatMessageUrlsLayout extends LinearLayout { ...@@ -96,18 +80,6 @@ public class RocketChatMessageUrlsLayout extends LinearLayout {
return; return;
} }
String title = webContent.getMetaTitle();
String description = webContent.getMetaDescription();
if (description != null) {
if (description.startsWith("\"")) {
description = description.substring(1);
}
if (description.endsWith("\"")) {
description = description.substring(0, description.length() - 1);
}
}
final String imageURL = webContent.getMetaImage(); final String imageURL = webContent.getMetaImage();
WebContentParsedUrl parsedUrl = webContent.getParsedUrl(); WebContentParsedUrl parsedUrl = webContent.getParsedUrl();
...@@ -116,8 +88,8 @@ public class RocketChatMessageUrlsLayout extends LinearLayout { ...@@ -116,8 +88,8 @@ public class RocketChatMessageUrlsLayout extends LinearLayout {
View embedUrl = inflater.inflate(R.layout.message_inline_embed_url, this, false); View embedUrl = inflater.inflate(R.layout.message_inline_embed_url, this, false);
((TextView) embedUrl.findViewById(R.id.hostname)).setText(host); ((TextView) embedUrl.findViewById(R.id.hostname)).setText(host);
((TextView) embedUrl.findViewById(R.id.title)).setText(title); ((TextView) embedUrl.findViewById(R.id.title)).setText(webContent.getMetaTitle());
((TextView) embedUrl.findViewById(R.id.description)).setText(description); ((TextView) embedUrl.findViewById(R.id.description)).setText(removeQuote(webContent.getMetaDescription()));
final SimpleDraweeView image = (SimpleDraweeView) embedUrl.findViewById(R.id.image); final SimpleDraweeView image = (SimpleDraweeView) embedUrl.findViewById(R.id.image);
if (TextUtils.isEmpty(imageURL)) { if (TextUtils.isEmpty(imageURL)) {
...@@ -139,6 +111,34 @@ public class RocketChatMessageUrlsLayout extends LinearLayout { ...@@ -139,6 +111,34 @@ public class RocketChatMessageUrlsLayout extends LinearLayout {
addView(embedUrl); addView(embedUrl);
} }
private String removeQuote(String description) {
if (description != null) {
if (description.startsWith("\"")) {
description = description.substring(1);
}
if (description.endsWith("\"")) {
description = description.substring(0, description.length() - 1);
}
}
return description;
}
private void addMessageInlineImage(WebContent webContent, boolean autoloadImages, String url) {
final WebContentHeaders webContentHeaders = webContent.getHeaders();
String contentType = webContentHeaders != null ? webContentHeaders.getContentType() : "";
if (contentType != null && contentType.startsWith("image/")
&& ImageFormat.SUPPORTED_LIST.contains(contentType)) {
final View inlineImageView = inflater.inflate(R.layout.message_inline_image, this, false);
final SimpleDraweeView
inlineImage = (SimpleDraweeView) inlineImageView.findViewById(R.id.message_inline_image);
final View loadView = inlineImageView.findViewById(R.id.message_inline_image_load);
loadImage(url, inlineImage, loadView, autoloadImages);
addView(inlineImageView);
}
}
private void loadImage(final String url, final SimpleDraweeView drawee, final View load, private void loadImage(final String url, final SimpleDraweeView drawee, final View load,
boolean autoloadImage) { boolean autoloadImage) {
if (autoloadImage) { if (autoloadImage) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment