From fc792a8f24c4d3080cf5f5e16df91f799c961c87 Mon Sep 17 00:00:00 2001 From: stom79 Date: Sat, 2 Dec 2017 11:29:29 +0100 Subject: [PATCH] Some improvements --- .../mastodon/activities/MediaActivity.java | 9 +++++---- .../fr/gouv/etalab/mastodon/helper/Helper.java | 12 ++++++------ .../mastodon/jobs/HomeTimelineSyncJob.java | 12 ++++++------ .../mastodon/jobs/NotificationsSyncJob.java | 14 +++++++------- .../services/LiveNotificationService.java | 16 ++++++---------- 5 files changed, 30 insertions(+), 33 deletions(-) diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/MediaActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/MediaActivity.java index 094480faf..f39933e2f 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/MediaActivity.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/MediaActivity.java @@ -311,16 +311,16 @@ public class MediaActivity extends AppCompatActivity implements OnDownloadInterf Glide.with(getApplicationContext()) .asBitmap() .load(url) - .listener(new RequestListener() { + .listener(new RequestListener() { @Override - public boolean onLoadFailed(@Nullable GlideException e, Object model, Target target, boolean isFirstResource) { - loader.setVisibility(View.GONE); + public boolean onResourceReady(Bitmap resource, Object model, Target target, DataSource dataSource, boolean isFirstResource) { return false; } @Override - public boolean onResourceReady(Object resource, Object model, Target target, DataSource dataSource, boolean isFirstResource) { + public boolean onLoadFailed(@Nullable GlideException e, Object model, Target target, boolean isFirstResource) { + loader.setVisibility(View.GONE); return false; } }) @@ -330,6 +330,7 @@ public class MediaActivity extends AppCompatActivity implements OnDownloadInterf loader.setVisibility(View.GONE); imageView.setVisibility(View.VISIBLE); downloadedImage = resource; + imageView.setImageBitmap(resource); fileVideo = null; } }); diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java b/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java index f649a4c0d..b660faf4d 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java @@ -1199,7 +1199,12 @@ public class Helper { Glide.with(context) .asBitmap() .load(emoji.getUrl()) - .listener(new RequestListener() { + .listener(new RequestListener() { + + @Override + public boolean onResourceReady(Bitmap resource, Object model, Target target, DataSource dataSource, boolean isFirstResource) { + return false; + } @Override public boolean onLoadFailed(@Nullable GlideException e, Object model, Target target, boolean isFirstResource) { @@ -1208,11 +1213,6 @@ public class Helper { listener.onRetrieveEmoji(status, spannableString, false); return false; } - - @Override - public boolean onResourceReady(Object resource, Object model, Target target, DataSource dataSource, boolean isFirstResource) { - return false; - } }) .into(new SimpleTarget() { @Override diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/jobs/HomeTimelineSyncJob.java b/app/src/main/java/fr/gouv/etalab/mastodon/jobs/HomeTimelineSyncJob.java index f66a688d7..04836469f 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/jobs/HomeTimelineSyncJob.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/jobs/HomeTimelineSyncJob.java @@ -167,7 +167,12 @@ public class HomeTimelineSyncJob extends Job implements OnRetrieveHomeTimelineSe Glide.with(getContext()) .asBitmap() .load(notificationUrl) - .listener(new RequestListener() { + .listener(new RequestListener(){ + + @Override + public boolean onResourceReady(Bitmap resource, Object model, Target target, DataSource dataSource, boolean isFirstResource) { + return false; + } @Override public boolean onLoadFailed(@Nullable GlideException e, Object model, Target target, boolean isFirstResource) { @@ -178,11 +183,6 @@ public class HomeTimelineSyncJob extends Job implements OnRetrieveHomeTimelineSe editor.apply(); return false; } - - @Override - public boolean onResourceReady(Object resource, Object model, Target target, DataSource dataSource, boolean isFirstResource) { - return false; - } }) .into(new SimpleTarget() { @Override diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/jobs/NotificationsSyncJob.java b/app/src/main/java/fr/gouv/etalab/mastodon/jobs/NotificationsSyncJob.java index 22dd7b4b3..eed38ec4f 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/jobs/NotificationsSyncJob.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/jobs/NotificationsSyncJob.java @@ -68,7 +68,7 @@ public class NotificationsSyncJob extends Job implements OnRetrieveNotifications @NonNull @Override - protected Result onRunJob(Params params) { + protected Result onRunJob(@NonNull Params params) { //Code refresh here callAsynchronousTask(); return Result.SUCCESS; @@ -233,7 +233,12 @@ public class NotificationsSyncJob extends Job implements OnRetrieveNotifications Glide.with(getContext()) .asBitmap() .load(notificationUrl) - .listener(new RequestListener() { + .listener(new RequestListener() { + + @Override + public boolean onResourceReady(Bitmap resource, Object model, Target target, DataSource dataSource, boolean isFirstResource) { + return false; + } @Override public boolean onLoadFailed(@Nullable GlideException e, Object model, Target target, boolean isFirstResource) { @@ -247,11 +252,6 @@ public class NotificationsSyncJob extends Job implements OnRetrieveNotifications } return false; } - - @Override - public boolean onResourceReady(Object resource, Object model, Target target, DataSource dataSource, boolean isFirstResource) { - return false; - } }) .into(new SimpleTarget() { @Override diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/services/LiveNotificationService.java b/app/src/main/java/fr/gouv/etalab/mastodon/services/LiveNotificationService.java index 414fb53b6..8a06d2479 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/services/LiveNotificationService.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/services/LiveNotificationService.java @@ -25,9 +25,6 @@ import android.os.IBinder; import android.os.SystemClock; import android.support.annotation.Nullable; import android.support.v4.content.LocalBroadcastManager; -import android.text.Spannable; -import android.text.style.ImageSpan; -import android.view.View; import com.bumptech.glide.Glide; @@ -43,7 +40,6 @@ import org.json.JSONObject; import java.io.BufferedInputStream; import java.io.BufferedReader; -import java.io.File; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; @@ -332,7 +328,12 @@ public class LiveNotificationService extends IntentService { Glide.with(getApplicationContext()) .asBitmap() .load(notification.getAccount().getAvatar()) - .listener(new RequestListener() { + .listener(new RequestListener() { + + @Override + public boolean onResourceReady(Bitmap resource, Object model, Target target, DataSource dataSource, boolean isFirstResource) { + return false; + } @Override public boolean onLoadFailed(@Nullable GlideException e, Object model, Target target, boolean isFirstResource) { @@ -346,11 +347,6 @@ public class LiveNotificationService extends IntentService { } return false; } - - @Override - public boolean onResourceReady(Object resource, Object model, Target target, DataSource dataSource, boolean isFirstResource) { - return false; - } }) .into(new SimpleTarget() { @Override