diff options
| author | Andrew Dolgov <[email protected]> | 2017-10-31 13:25:40 +0300 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2017-10-31 13:25:40 +0300 |
| commit | ab4d1b8c661277bc3b5ad6e6465ba09bf9e113c6 (patch) | |
| tree | 24530f12e85462a0df488d550ed73e03b6ee91e7 /org.fox.ttrss/src/main | |
| parent | 83be8de482edf755647ae198a2ac14f4bbee1725 (diff) | |
offline: support caching (and displaying) video content
Diffstat (limited to 'org.fox.ttrss/src/main')
3 files changed, 10 insertions, 8 deletions
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java index 1ab89c21..eb5e1f81 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java @@ -319,10 +319,12 @@ public class OfflineArticleFragment extends Fragment { if (doc != null) { if (m_prefs.getBoolean("offline_image_cache_enabled", false)) { - Elements images = doc.select("img"); + Elements images = doc.select("img,source"); for (Element img : images) { String url = img.attr("src"); + + Log.d(TAG, "src=" + url); if (ImageCacheService.isUrlCached(m_activity, url)) { img.attr("src", "file://" + ImageCacheService.getCacheFileName(m_activity, url)); @@ -331,10 +333,10 @@ public class OfflineArticleFragment extends Fragment { } // thanks webview for crashing on <video> tag - Elements videos = doc.select("video"); + /*Elements videos = doc.select("video"); for (Element video : videos) - video.remove(); + video.remove();*/ articleContent = doc.toString(); } @@ -352,7 +354,7 @@ public class OfflineArticleFragment extends Fragment { "<meta name=\"viewport\" content=\"width=device-width, user-scalable=no\" />" + "<style type=\"text/css\">" + "body { padding : 0px; margin : 0px; line-height : 130%; }" + - "img { max-width : 100%; width : auto; height : auto; }" + + "img,video { max-width : 100%; width : auto; height : auto; }" + " table { width : 100%; }" + cssOverride + "</style>" + diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineDownloadService.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineDownloadService.java index e5fa782a..87c8ceca 100644 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineDownloadService.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineDownloadService.java @@ -461,7 +461,7 @@ public class OfflineDownloadService extends Service { Document doc = Jsoup.parse(article.content); if (doc != null) { - Elements images = doc.select("img"); + Elements images = doc.select("img,source"); for (Element img : images) { String url = img.attr("src"); diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/util/ImageCacheService.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/util/ImageCacheService.java index 7e4a3e11..6aa459c7 100644 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/util/ImageCacheService.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/util/ImageCacheService.java @@ -93,7 +93,7 @@ public class ImageCacheService extends IntentService { File storage = context.getExternalCacheDir(); - File file = new File(storage.getAbsolutePath() + CACHE_PATH + "/" + hashedUrl + ".png"); + File file = new File(storage.getAbsolutePath() + CACHE_PATH + "/" + hashedUrl); return file.exists(); } @@ -103,7 +103,7 @@ public class ImageCacheService extends IntentService { File storage = context.getExternalCacheDir(); - File file = new File(storage.getAbsolutePath() + CACHE_PATH + "/" + hashedUrl + ".png"); + File file = new File(storage.getAbsolutePath() + CACHE_PATH + "/" + hashedUrl); return file.getAbsolutePath(); } @@ -245,7 +245,7 @@ public class ImageCacheService extends IntentService { if (!cachePath.exists()) cachePath.mkdirs(); if (cachePath.isDirectory() && hashedUrl != null) { - File outputFile = new File(cachePath.getAbsolutePath() + "/" + hashedUrl + ".png"); + File outputFile = new File(cachePath.getAbsolutePath() + "/" + hashedUrl); if (!outputFile.exists()) { |