do not crash on video elements w/o source

2 files changed, 26 insertions, 17 deletions

diff --git a/org.fox.ttrss/src/main/AndroidManifest.xml b/org.fox.ttrss/src/main/AndroidManifest.xml
index 0838d385..8f8b98d9 100755
--- a/org.fox.ttrss/src/main/AndroidManifest.xml
+++ b/org.fox.ttrss/src/main/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.fox.ttrss"
-    android:versionCode="373"
-    android:versionName="1.146" >
+    android:versionCode="374"
+    android:versionName="1.147" >
 
     <uses-sdk
         android:minSdkVersion="15"
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/types/Article.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/types/Article.java
index fe875c87..19a02bd5 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/types/Article.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/types/Article.java
@@ -83,28 +83,37 @@ public class Article implements Parcelable {
 
 			if (flavorImage != null) {
 
-				if ("video".equals(flavorImage.tagName().toLowerCase())) {
-					Element source = flavorImage.select("source").first();
-					flavorStreamUri = source.attr("src");
+				try {
 
-					flavorImageUri = flavorImage.attr("poster");
-				} else if ("iframe".equals(flavorImage.tagName().toLowerCase())) {
+					if ("video".equals(flavorImage.tagName().toLowerCase())) {
+						Element source = flavorImage.select("source").first();
+						flavorStreamUri = source.attr("src");
 
-					String srcEmbed = flavorImage.attr("src");
+						flavorImageUri = flavorImage.attr("poster");
+					} else if ("iframe".equals(flavorImage.tagName().toLowerCase())) {
 
-					if (srcEmbed.length() > 0) {
-						Pattern pattern = Pattern.compile("/embed/([\\w-]+)");
-						Matcher matcher = pattern.matcher(srcEmbed);
+						String srcEmbed = flavorImage.attr("src");
 
-						if (matcher.find()) {
-							youtubeVid = matcher.group(1);
+						if (srcEmbed.length() > 0) {
+							Pattern pattern = Pattern.compile("/embed/([\\w-]+)");
+							Matcher matcher = pattern.matcher(srcEmbed);
 
-							flavorImageUri = "https://img.youtube.com/vi/" + youtubeVid + "/mqdefault.jpg";
-							flavorStreamUri = "https://youtu.be/" + youtubeVid;
+							if (matcher.find()) {
+								youtubeVid = matcher.group(1);
+
+								flavorImageUri = "https://img.youtube.com/vi/" + youtubeVid + "/mqdefault.jpg";
+								flavorStreamUri = "https://youtu.be/" + youtubeVid;
+							}
 						}
+					} else {
+						flavorImageUri = flavorImage.attr("src");
+						flavorStreamUri = null;
 					}
-				} else {
-					flavorImageUri = flavorImage.attr("src");
+				} catch (Exception e) {
+					e.printStackTrace();
+
+					flavorImage = null;
+					flavorImageUri = null;
 					flavorStreamUri = null;
 				}
 			}