diff options
| -rw-r--r-- | AndroidManifest.xml | 4 | ||||
| -rw-r--r-- | src/org/fox/ttrss/ArticleFragment.java | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 18a48b45..39783d68 100644 --- a/AndroidManifest.xml +++ b/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="110" - android:versionName="0.8.9" > + android:versionCode="111" + android:versionName="0.8.10" > <uses-sdk android:minSdkVersion="8" diff --git a/src/org/fox/ttrss/ArticleFragment.java b/src/org/fox/ttrss/ArticleFragment.java index 9a7b0ed3..6da3133a 100644 --- a/src/org/fox/ttrss/ArticleFragment.java +++ b/src/org/fox/ttrss/ArticleFragment.java @@ -2,6 +2,7 @@ package org.fox.ttrss; import java.net.MalformedURLException;
import java.net.URL;
+import java.net.URLEncoder;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
@@ -260,7 +261,7 @@ public class ArticleFragment extends Fragment { getActivity(), android.R.layout.simple_spinner_item, spinnerArray);
spinnerArrayAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-
+
for (Attachment a : m_article.attachments) {
if (a.content_type != null && a.content_url != null) {
@@ -268,20 +269,19 @@ public class ArticleFragment extends Fragment { URL url = new URL(a.content_url.trim());
String strUrl = url.toString().trim();
- String regex = String.format("<img.*?src=[\"']%1$[\"']", strUrl);
+ String regex = String.format(".*?<img.*src=[\"']%1$s[\"'].*", strUrl);
- if (a.content_type.indexOf("image") != -1 && !articleContent.matches(regex)) {
+ if (a.content_type.indexOf("image") != -1 && !articleContent.replaceAll("[\r\n]", "").matches(regex)) {
content += "<p><img src=\"" + strUrl.replace("\"", "\\\"") + "\"></p>";
}
-
- spinnerArray.add(a);
} catch (MalformedURLException e) {
//
} catch (Exception e) {
e.printStackTrace();
}
-
+
+ spinnerArray.add(a);
}
}
|