Merge pull request #1898 from mfietz/embedded-images

Re-enable embedded images

12 files changed, 94 insertions, 79 deletions

diff --git a/core/src/main/java/de/danoeh/antennapod/core/asynctask/ImageResource.java b/core/src/main/java/de/danoeh/antennapod/core/asynctask/ImageResource.java
index 992321441..b01e3f3ba 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/asynctask/ImageResource.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/asynctask/ImageResource.java
@@ -1,7 +1,5 @@
 package de.danoeh.antennapod.core.asynctask;
 
-import android.net.Uri;
-
 /**
  * Classes that implement this interface provide access to an image resource that can
  * be loaded by the Picasso library.
@@ -9,29 +7,9 @@ import android.net.Uri;
 public interface ImageResource {
 
     /**
-     * This scheme should be used by PicassoImageResources to
-     * indicate that the image Uri points to a file that is not an image
-     * (e.g. a media file). This workaround is needed so that the Picasso library
-     * loads these Uri with a Downloader instead of trying to load it directly.
-     * <p/>
-     * For example implementations, see FeedMedia or ExternalMedia.
-     */
-    String SCHEME_MEDIA = "media";
-
-
-    /**
-     * Parameter key for an encoded fallback Uri. This Uri MUST point to a local image file
-     */
-    String PARAM_FALLBACK = "fallback";
-
-    /**
-     * Returns a Uri to the image or null if no image is available.
-     * <p/>
-     * The Uri can either be an HTTP-URL, a URL pointing to a local image file or
-     * a non-image file (see SCHEME_MEDIA for more details).
+     * Returns the location of the image or null if no image is available.
      * <p/>
-     * The Uri can also have an optional fallback-URL if loading the default URL
-     * failed (see PARAM_FALLBACK).
+     * The location can either be an URL or a local path
      */
-    Uri getImageUri();
+    String getImageLocation();
 }
diff --git a/core/src/main/java/de/danoeh/antennapod/core/cast/RemoteMedia.java b/core/src/main/java/de/danoeh/antennapod/core/cast/RemoteMedia.java
index 99f7b9496..a5301db17 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/cast/RemoteMedia.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/cast/RemoteMedia.java
@@ -4,6 +4,7 @@ import android.content.SharedPreferences;
 import android.net.Uri;
 import android.os.Parcel;
 import android.os.Parcelable;
+import android.support.annotation.Nullable;
 import android.text.TextUtils;
 
 import com.google.android.gms.cast.MediaInfo;
@@ -267,11 +268,9 @@ public class RemoteMedia implements Playable {
     }
 
     @Override
-    public Uri getImageUri() {
-        if (imageUrl != null) {
-            return Uri.parse(imageUrl);
-        }
-        return null;
+    @Nullable
+    public String getImageLocation() {
+        return imageUrl;
     }
 
     @Override
diff --git a/core/src/main/java/de/danoeh/antennapod/core/feed/Feed.java b/core/src/main/java/de/danoeh/antennapod/core/feed/Feed.java
index 67ac2d280..bb0724d66 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/feed/Feed.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/feed/Feed.java
@@ -2,7 +2,6 @@ package de.danoeh.antennapod.core.feed;
 
 import android.content.Context;
 import android.database.Cursor;
-import android.net.Uri;
 import android.support.annotation.Nullable;
 import android.text.TextUtils;
 
@@ -501,9 +500,9 @@ public class Feed extends FeedFile implements FlattrThing, ImageResource {
     }
 
     @Override
-    public Uri getImageUri() {
+    public String getImageLocation() {
         if (image != null) {
-            return image.getImageUri();
+            return image.getImageLocation();
         } else {
             return null;
         }
diff --git a/core/src/main/java/de/danoeh/antennapod/core/feed/FeedImage.java b/core/src/main/java/de/danoeh/antennapod/core/feed/FeedImage.java
index bd7ceb54f..f0c508830 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/feed/FeedImage.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/feed/FeedImage.java
@@ -1,7 +1,6 @@
 package de.danoeh.antennapod.core.feed;
 
 import android.database.Cursor;
-import android.net.Uri;
 
 import java.io.File;
 
@@ -81,11 +80,11 @@ public class FeedImage extends FeedFile implements ImageResource {
 	}
 
     @Override
-    public Uri getImageUri() {
+    public String getImageLocation() {
         if (file_url != null && downloaded) {
-            return Uri.fromFile(new File(file_url));
+            return new File(file_url).getAbsolutePath();
         } else if(download_url != null) {
-            return Uri.parse(download_url);
+            return download_url;
         } else {
             return null;
         }
diff --git a/core/src/main/java/de/danoeh/antennapod/core/feed/FeedItem.java b/core/src/main/java/de/danoeh/antennapod/core/feed/FeedItem.java
index 4921c0576..8627bcda8 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/feed/FeedItem.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/feed/FeedItem.java
@@ -1,7 +1,6 @@
 package de.danoeh.antennapod.core.feed;
 
 import android.database.Cursor;
-import android.net.Uri;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -374,13 +373,13 @@ public class FeedItem extends FeedComponent implements ShownotesProvider, Flattr
     }
 
     @Override
-    public Uri getImageUri() {
+    public String getImageLocation() {
         if(media != null && media.hasEmbeddedPicture()) {
-            return media.getImageUri();
+            return media.getImageLocation();
         } else if (image != null) {
-           return image.getImageUri();
+           return image.getImageLocation();
         } else if (feed != null) {
-            return feed.getImageUri();
+            return feed.getImageLocation();
         } else {
             return null;
         }
diff --git a/core/src/main/java/de/danoeh/antennapod/core/feed/FeedMedia.java b/core/src/main/java/de/danoeh/antennapod/core/feed/FeedMedia.java
index 7f064fff3..068669af9 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/feed/FeedMedia.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/feed/FeedMedia.java
@@ -4,7 +4,6 @@ import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
 import android.database.Cursor;
 import android.media.MediaMetadataRetriever;
-import android.net.Uri;
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.support.annotation.Nullable;
@@ -321,12 +320,10 @@ public class FeedMedia extends FeedFile implements Playable {
     }
 
     public boolean hasEmbeddedPicture() {
-        return false;
-        // TODO: reenable!
-        //if(hasEmbeddedPicture == null) {
-        //    checkEmbeddedPicture();
-        //}
-        //return hasEmbeddedPicture;
+        if(hasEmbeddedPicture == null) {
+            checkEmbeddedPicture();
+        }
+        return hasEmbeddedPicture;
     }
 
     @Override
@@ -514,20 +511,11 @@ public class FeedMedia extends FeedFile implements Playable {
     };
 
     @Override
-    public Uri getImageUri() {
+    public String getImageLocation() {
         if (hasEmbeddedPicture()) {
-            Uri.Builder builder = new Uri.Builder();
-            builder.scheme(SCHEME_MEDIA).encodedPath(getLocalMediaUrl());
-
-            if (item != null && item.getFeed() != null) {
-                final Uri feedImgUri = item.getFeed().getImageUri();
-                if (feedImgUri != null) {
-                    builder.appendQueryParameter(PARAM_FALLBACK, feedImgUri.toString());
-                }
-            }
-            return builder.build();
+            return getLocalMediaUrl();
         } else if(item != null) {
-            return item.getImageUri();
+            return item.getImageLocation();
         } else {
             return null;
         }
@@ -550,7 +538,7 @@ public class FeedMedia extends FeedFile implements Playable {
         super.setFile_url(file_url);
     }
 
-    private void checkEmbeddedPicture() {
+    public void checkEmbeddedPicture() {
         if (!localFileAvailable()) {
             hasEmbeddedPicture = Boolean.FALSE;
             return;
diff --git a/core/src/main/java/de/danoeh/antennapod/core/glide/ApGlideModule.java b/core/src/main/java/de/danoeh/antennapod/core/glide/ApGlideModule.java
index 0baff9723..835dee735 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/glide/ApGlideModule.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/glide/ApGlideModule.java
@@ -6,7 +6,6 @@ import com.bumptech.glide.Glide;
 import com.bumptech.glide.GlideBuilder;
 import com.bumptech.glide.load.DecodeFormat;
 import com.bumptech.glide.load.engine.cache.InternalCacheDiskCacheFactory;
-import com.bumptech.glide.load.model.GlideUrl;
 import com.bumptech.glide.module.GlideModule;
 
 import java.io.InputStream;
@@ -27,7 +26,7 @@ public class ApGlideModule implements GlideModule {
 
     @Override
     public void registerComponents(Context context, Glide glide) {
-        glide.register(GlideUrl.class, InputStream.class, new ApOkHttpUrlLoader.Factory());
+        glide.register(String.class, InputStream.class, new ApOkHttpUrlLoader.Factory());
     }
 
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/de/danoeh/antennapod/core/glide/ApOkHttpUrlLoader.java b/core/src/main/java/de/danoeh/antennapod/core/glide/ApOkHttpUrlLoader.java
index 513264a05..d67db198d 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/glide/ApOkHttpUrlLoader.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/glide/ApOkHttpUrlLoader.java
@@ -26,14 +26,14 @@ import de.danoeh.antennapod.core.util.NetworkUtils;
 /**
  * @see com.bumptech.glide.integration.okhttp.OkHttpUrlLoader
  */
-public class ApOkHttpUrlLoader implements ModelLoader<GlideUrl, InputStream> {
+public class ApOkHttpUrlLoader implements ModelLoader<String, InputStream> {
 
     private static final String TAG = ApOkHttpUrlLoader.class.getSimpleName();
 
     /**
      * The default factory for {@link ApOkHttpUrlLoader}s.
      */
-    public static class Factory implements ModelLoaderFactory<GlideUrl, InputStream> {
+    public static class Factory implements ModelLoaderFactory<String, InputStream> {
 
         private static volatile OkHttpClient internalClient;
         private OkHttpClient client;
@@ -66,7 +66,7 @@ public class ApOkHttpUrlLoader implements ModelLoader<GlideUrl, InputStream> {
         }
 
         @Override
-        public ModelLoader<GlideUrl, InputStream> build(Context context, GenericLoaderFactory factories) {
+        public ModelLoader<String, InputStream> build(Context context, GenericLoaderFactory factories) {
             return new ApOkHttpUrlLoader(client);
         }
 
@@ -83,8 +83,15 @@ public class ApOkHttpUrlLoader implements ModelLoader<GlideUrl, InputStream> {
     }
 
     @Override
-    public DataFetcher<InputStream> getResourceFetcher(GlideUrl model, int width, int height) {
-        return new OkHttpStreamFetcher(client, model);
+    public DataFetcher<InputStream> getResourceFetcher(String model, int width, int height) {
+        Log.d(TAG, "getResourceFetcher() called with: " + "model = [" + model + "], width = ["
+                + width + "], height = [" + height + "]");
+        if(model.startsWith("/")) {
+            return new AudioCoverFetcher(model);
+        } else {
+            GlideUrl url = new GlideUrl(model);
+            return new OkHttpStreamFetcher(client, url);
+        }
     }
 
     private static class NetworkAllowanceInterceptor implements Interceptor {
diff --git a/core/src/main/java/de/danoeh/antennapod/core/glide/AudioCoverFetcher.java b/core/src/main/java/de/danoeh/antennapod/core/glide/AudioCoverFetcher.java
new file mode 100644
index 000000000..48dadc492
--- /dev/null
+++ b/core/src/main/java/de/danoeh/antennapod/core/glide/AudioCoverFetcher.java
@@ -0,0 +1,48 @@
+package de.danoeh.antennapod.core.glide;
+
+import android.media.MediaMetadataRetriever;
+import android.util.Log;
+
+import com.bumptech.glide.Priority;
+import com.bumptech.glide.load.data.DataFetcher;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+// see https://github.com/bumptech/glide/issues/699
+class AudioCoverFetcher implements DataFetcher<InputStream> {
+
+    private static final String TAG = "AudioCoverFetcher";
+
+    private final String path;
+
+    public AudioCoverFetcher(String path) {
+        this.path = path;
+    }
+
+    @Override public String getId() {
+        return path;
+    }
+
+    @Override public InputStream loadData(Priority priority) throws Exception {
+        MediaMetadataRetriever retriever = new MediaMetadataRetriever();
+        try {
+            retriever.setDataSource(path);
+            byte[] picture = retriever.getEmbeddedPicture();
+            if (picture != null) {
+                return new ByteArrayInputStream(picture);
+            }
+        } finally {
+            retriever.release();
+        }
+        throw new IOException("Loading embedded cover did not work");
+    }
+
+    @Override public void cleanup() {
+        // nothing to clean up
+    }
+    @Override public void cancel() {
+        // cannot cancel
+    }
+}
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadService.java b/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadService.java
index 00b0e6db3..06a89ca64 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadService.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadService.java
@@ -1009,7 +1009,7 @@ public class DownloadService extends Service {
             }
             media.setDownloaded(true);
             media.setFile_url(request.getDestination());
-            media.setHasEmbeddedPicture(null);
+            media.checkEmbeddedPicture(); // enforce check
 
             // check if file has chapters
             ChapterUtils.loadChaptersFromFileUrl(media);
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java
index e6d41879c..e2d63a385 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java
@@ -990,12 +990,12 @@ public class PlaybackService extends Service {
             builder.putString(MediaMetadataCompat.METADATA_KEY_DISPLAY_TITLE, p.getEpisodeTitle());
             builder.putString(MediaMetadataCompat.METADATA_KEY_ALBUM, p.getFeedTitle());
 
-            if (p.getImageUri() != null && UserPreferences.setLockscreenBackground()) {
-                builder.putString(MediaMetadataCompat.METADATA_KEY_ART_URI, p.getImageUri().toString());
+            if (p.getImageLocation() != null && UserPreferences.setLockscreenBackground()) {
+                builder.putString(MediaMetadataCompat.METADATA_KEY_ART_URI, p.getImageLocation().toString());
                 try {
                     if (isCasting) {
                         Bitmap art = Glide.with(this)
-                                .load(p.getImageUri())
+                                .load(p.getImageLocation())
                                 .asBitmap()
                                 .diskCacheStrategy(ApGlideSettings.AP_DISK_CACHE_STRATEGY)
                                 .into(Target.SIZE_ORIGINAL, Target.SIZE_ORIGINAL)
@@ -1005,7 +1005,7 @@ public class PlaybackService extends Service {
                         WindowManager wm = (WindowManager) getSystemService(Context.WINDOW_SERVICE);
                         Display display = wm.getDefaultDisplay();
                         Bitmap art = Glide.with(this)
-                                .load(p.getImageUri())
+                                .load(p.getImageLocation())
                                 .asBitmap()
                                 .diskCacheStrategy(ApGlideSettings.AP_DISK_CACHE_STRATEGY)
                                 .centerCrop()
@@ -1054,7 +1054,7 @@ public class PlaybackService extends Service {
                                 android.R.dimen.notification_large_icon_width);
                         try {
                             icon = Glide.with(PlaybackService.this)
-                                    .load(info.playable.getImageUri())
+                                    .load(info.playable.getImageLocation())
                                     .asBitmap()
                                     .diskCacheStrategy(ApGlideSettings.AP_DISK_CACHE_STRATEGY)
                                     .centerCrop()
diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/playback/ExternalMedia.java b/core/src/main/java/de/danoeh/antennapod/core/util/playback/ExternalMedia.java
index 412a27b95..a37f98469 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/util/playback/ExternalMedia.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/playback/ExternalMedia.java
@@ -3,7 +3,6 @@ package de.danoeh.antennapod.core.util.playback;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
 import android.media.MediaMetadataRetriever;
-import android.net.Uri;
 import android.os.Parcel;
 import android.os.Parcelable;
 
@@ -242,9 +241,9 @@ public class ExternalMedia implements Playable {
 	};
 
     @Override
-    public Uri getImageUri() {
+    public String getImageLocation() {
         if (localFileAvailable()) {
-            return new Uri.Builder().scheme(SCHEME_MEDIA).encodedPath(getLocalMediaUrl()).build();
+            return getLocalMediaUrl();
         } else {
             return null;
         }