diff options
| author | Andrew Dolgov <[email protected]> | 2013-06-25 10:48:03 +0400 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2013-06-25 10:48:03 +0400 |
| commit | 9af5dd1fb592ace719843b902a38844b1442c10a (patch) | |
| tree | a6b2b8fe527cb9d78e38de48588be59cad3a962c /src | |
| parent | 9c729d9a06a35142dacbd398e8224ee41125cb1a (diff) | |
fix "read more" links not working properly in embedded browser
bump version
Diffstat (limited to 'src')
| -rw-r--r-- | src/org/fox/ttrss/ArticleFragment.java | 11 | ||||
| -rw-r--r-- | src/org/fox/ttrss/offline/OfflineArticleFragment.java | 12 |
2 files changed, 21 insertions, 2 deletions
diff --git a/src/org/fox/ttrss/ArticleFragment.java b/src/org/fox/ttrss/ArticleFragment.java index 3d1b6075..c6d278cd 100644 --- a/src/org/fox/ttrss/ArticleFragment.java +++ b/src/org/fox/ttrss/ArticleFragment.java @@ -286,7 +286,16 @@ public class ArticleFragment extends Fragment implements GestureDetector.OnDoubl content += "<p> </p><p> </p><p> </p><p> </p></body></html>"; try { - web.loadDataWithBaseURL(m_article.link, content, "text/html", "utf-8", null); + String baseUrl = null; + + try { + URL url = new URL(m_article.link); + baseUrl = url.getProtocol() + "://" + url.getHost(); + } catch (MalformedURLException e) { + // + } + + web.loadDataWithBaseURL(baseUrl, content, "text/html", "utf-8", null); } catch (RuntimeException e) { e.printStackTrace(); } diff --git a/src/org/fox/ttrss/offline/OfflineArticleFragment.java b/src/org/fox/ttrss/offline/OfflineArticleFragment.java index 05d69cc2..e36bea8a 100644 --- a/src/org/fox/ttrss/offline/OfflineArticleFragment.java +++ b/src/org/fox/ttrss/offline/OfflineArticleFragment.java @@ -1,5 +1,6 @@ package org.fox.ttrss.offline; +import java.net.MalformedURLException; import java.net.URI; import java.net.URL; import java.text.DateFormat; @@ -281,7 +282,16 @@ public class OfflineArticleFragment extends Fragment implements GestureDetector. "<body>" + articleContent + "<p> </p><p> </p><p> </p><p> </p></body></html>"; try { - web.loadDataWithBaseURL(link, content, "text/html", "utf-8", null); + String baseUrl = null; + + try { + URL url = new URL(link); + baseUrl = url.getProtocol() + "://" + url.getHost(); + } catch (MalformedURLException e) { + // + } + + web.loadDataWithBaseURL(baseUrl, content, "text/html", "utf-8", null); } catch (RuntimeException e) { e.printStackTrace(); } |