Castopod
/
AntennaPod
mirror of https://github.com/AntennaPod/AntennaPod.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix loading the notification image

This commit is contained in:
Martin Fietz 2015-08-02 17:49:52 +02:00
parent ab116ee6be
commit 0824af6325
1 changed files with 23 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java
View File

@ -38,6 +38,7 @@ import org.apache.commons.lang3.StringUtils;
import java.io.IOException;
import java.util.List;
import java.util.concurrent.ExecutionException;
import de.danoeh.antennapod.core.ClientConfig;
import de.danoeh.antennapod.core.R;
@ -772,7 +773,7 @@ public class PlaybackService extends Service {
/**
* Used by setupNotification to load notification data in another thread.
*/
private AsyncTask<Void, Void, Void> notificationSetupTask;
private Thread notificationSetupThread;
/**
* Prepares notification and starts the service in the foreground.
@ -783,52 +784,47 @@ public class PlaybackService extends Service {
PlaybackService.getPlayerActivityIntent(this),
PendingIntent.FLAG_UPDATE_CURRENT);
if (notificationSetupTask != null) {
notificationSetupTask.cancel(true);
if (notificationSetupThread != null) {
notificationSetupThread.interrupt();
}
notificationSetupTask = new AsyncTask<Void, Void, Void>() {
Runnable notificationSetupTask = new Runnable() {
Bitmap icon = null;
@Override
protected Void doInBackground(Void... params) {
public void run() {
Log.d(TAG, "Starting background work");
if (android.os.Build.VERSION.SDK_INT >= 11) {
if (info.playable != null) {
int iconSize = getResources().getDimensionPixelSize(
android.R.dimen.notification_large_icon_width);
Glide.with(PlaybackService.this)
.load(info.playable.getImageUri())
.asBitmap()
.diskCacheStrategy(DiskCacheStrategy.SOURCE)
.into(new SimpleTarget<Bitmap>(iconSize, iconSize) {
@Override
public void onResourceReady(Bitmap bitmap, GlideAnimation anim) {
icon = bitmap;
}
});
try {
icon = Glide.with(PlaybackService.this)
.load(info.playable.getImageUri())
.asBitmap()
.diskCacheStrategy(DiskCacheStrategy.SOURCE)
.into(-1, -1) // this resizing would not be exact, so we have
// scale the bitmap ourselves
.get();
icon = Bitmap.createScaledBitmap(icon, iconSize, iconSize, true);
} catch (InterruptedException e) {
e.printStackTrace();
} catch (ExecutionException e) {
e.printStackTrace();
}
}
}
if (icon == null) {
icon = BitmapFactory.decodeResource(getApplicationContext().getResources(),
ClientConfig.playbackServiceCallbacks.getNotificationIconResource(getApplicationContext()));
}
return null;
}
@Override
protected void onPostExecute(Void result) {
super.onPostExecute(result);
if (mediaPlayer == null) {
return;
}
PlayerStatus playerStatus = mediaPlayer.getPlayerStatus();
final int smallIcon = ClientConfig.playbackServiceCallbacks.getNotificationIconResource(getApplicationContext());
if (!isCancelled() &&
started &&
info.playable != null) {
if (!Thread.currentThread().isInterrupted() && started && info.playable != null) {
String contentText = info.playable.getFeedTitle();
String contentTitle = info.playable.getEpisodeTitle();
Notification notification = null;
@ -906,15 +902,9 @@ public class PlaybackService extends Service {
Log.d(TAG, "Notification set up");
}
}
};
if (android.os.Build.VERSION.SDK_INT > android.os.Build.VERSION_CODES.GINGERBREAD_MR1) {
notificationSetupTask
.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
} else {
notificationSetupTask.execute();
}
notificationSetupThread = new Thread(notificationSetupTask);
notificationSetupThread.start();
}
/**