From 936caba327d72532659c5882031ba97c1a92432e Mon Sep 17 00:00:00 2001 From: Andy Klimczak Date: Sat, 23 Dec 2017 10:22:30 -0500 Subject: [PATCH] Webm Image Search - When image searching using a webm, submit the thumbnail instead - Image searches don't support webm Fixes #370 --- .../chan/ui/controller/ImageViewerController.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/Clover/app/src/main/java/org/floens/chan/ui/controller/ImageViewerController.java b/Clover/app/src/main/java/org/floens/chan/ui/controller/ImageViewerController.java index 862bb50e..ca65d03f 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/controller/ImageViewerController.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/controller/ImageViewerController.java @@ -204,7 +204,8 @@ public class ImageViewerController extends Controller implements ImageViewerPres public void onFloatingMenuItemClicked(FloatingMenu menu, FloatingMenuItem item) { for (ImageSearch imageSearch : ImageSearch.engines) { if (((Integer) item.getId()) == imageSearch.getId()) { - AndroidUtils.openLinkInBrowser((Activity) context, imageSearch.getUrl(presenter.getCurrentPostImage().imageUrl)); + final String searchImageUrl = getSearchImageUrl(presenter.getCurrentPostImage()); + AndroidUtils.openLinkInBrowser((Activity) context, imageSearch.getUrl(searchImageUrl)); break; } } @@ -534,4 +535,13 @@ public class ImageViewerController extends Controller implements ImageViewerPres public interface GoPostCallback { ImageViewerCallback goToPost(PostImage postImage); } + + /** + * Send thumbnail image of movie posts because none of the image search providers support movies (such as webm) directly + * @param postImage + * @return url of an image to be searched + */ + private String getSearchImageUrl(final PostImage postImage) { + return postImage.type == PostImage.Type.MOVIE ? postImage.thumbnailUrl : postImage.imageUrl; + } }