Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

Some improvements

This commit is contained in:
stom79 2017-12-02 11:29:29 +01:00
parent e3c663237c
commit fc792a8f24
5 changed files with 30 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/fr/gouv/etalab/mastodon/activities/MediaActivity.java
View File

@ -311,16 +311,16 @@ public class MediaActivity extends AppCompatActivity implements OnDownloadInterf
Glide.with(getApplicationContext()) Glide.with(getApplicationContext())
.asBitmap() .asBitmap()
.load(url) .load(url)
.listener(new RequestListener() { .listener(new RequestListener<Bitmap>() {
@Override @Override
public boolean onLoadFailed(@Nullable GlideException e, Object model, Target target, boolean isFirstResource) { public boolean onResourceReady(Bitmap resource, Object model, Target<Bitmap> target, DataSource dataSource, boolean isFirstResource) {
loader.setVisibility(View.GONE);
return false; return false;
} }
@Override @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; return false;
} }
}) })
@ -330,6 +330,7 @@ public class MediaActivity extends AppCompatActivity implements OnDownloadInterf
loader.setVisibility(View.GONE); loader.setVisibility(View.GONE);
imageView.setVisibility(View.VISIBLE); imageView.setVisibility(View.VISIBLE);
downloadedImage = resource; downloadedImage = resource;
imageView.setImageBitmap(resource);
fileVideo = null; fileVideo = null;
} }
}); });

12
app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java
View File

@ -1199,7 +1199,12 @@ public class Helper {
Glide.with(context) Glide.with(context)
.asBitmap() .asBitmap()
.load(emoji.getUrl()) .load(emoji.getUrl())
.listener(new RequestListener() { .listener(new RequestListener<Bitmap>() {
@Override
public boolean onResourceReady(Bitmap resource, Object model, Target<Bitmap> target, DataSource dataSource, boolean isFirstResource) {
return false;
}
@Override @Override
public boolean onLoadFailed(@Nullable GlideException e, Object model, Target target, boolean isFirstResource) { public boolean onLoadFailed(@Nullable GlideException e, Object model, Target target, boolean isFirstResource) {
@ -1208,11 +1213,6 @@ public class Helper {
listener.onRetrieveEmoji(status, spannableString, false); listener.onRetrieveEmoji(status, spannableString, false);
return false; return false;
} }
@Override
public boolean onResourceReady(Object resource, Object model, Target target, DataSource dataSource, boolean isFirstResource) {
return false;
}
}) })
.into(new SimpleTarget<Bitmap>() { .into(new SimpleTarget<Bitmap>() {
@Override @Override

12
app/src/main/java/fr/gouv/etalab/mastodon/jobs/HomeTimelineSyncJob.java
View File

@ -167,7 +167,12 @@ public class HomeTimelineSyncJob extends Job implements OnRetrieveHomeTimelineSe
Glide.with(getContext()) Glide.with(getContext())
.asBitmap() .asBitmap()
.load(notificationUrl) .load(notificationUrl)
.listener(new RequestListener() { .listener(new RequestListener<Bitmap>(){
@Override
public boolean onResourceReady(Bitmap resource, Object model, Target<Bitmap> target, DataSource dataSource, boolean isFirstResource) {
return false;
}
@Override @Override
public boolean onLoadFailed(@Nullable GlideException e, Object model, Target target, boolean isFirstResource) { 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(); editor.apply();
return false; return false;
} }
@Override
public boolean onResourceReady(Object resource, Object model, Target target, DataSource dataSource, boolean isFirstResource) {
return false;
}
}) })
.into(new SimpleTarget<Bitmap>() { .into(new SimpleTarget<Bitmap>() {
@Override @Override

14
app/src/main/java/fr/gouv/etalab/mastodon/jobs/NotificationsSyncJob.java
View File

@ -68,7 +68,7 @@ public class NotificationsSyncJob extends Job implements OnRetrieveNotifications
@NonNull @NonNull
@Override @Override
protected Result onRunJob(Params params) { protected Result onRunJob(@NonNull Params params) {
//Code refresh here //Code refresh here
callAsynchronousTask(); callAsynchronousTask();
return Result.SUCCESS; return Result.SUCCESS;
@ -233,7 +233,12 @@ public class NotificationsSyncJob extends Job implements OnRetrieveNotifications
Glide.with(getContext()) Glide.with(getContext())
.asBitmap() .asBitmap()
.load(notificationUrl) .load(notificationUrl)
.listener(new RequestListener() { .listener(new RequestListener<Bitmap>() {
@Override
public boolean onResourceReady(Bitmap resource, Object model, Target<Bitmap> target, DataSource dataSource, boolean isFirstResource) {
return false;
}
@Override @Override
public boolean onLoadFailed(@Nullable GlideException e, Object model, Target target, boolean isFirstResource) { 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; return false;
} }
@Override
public boolean onResourceReady(Object resource, Object model, Target target, DataSource dataSource, boolean isFirstResource) {
return false;
}
}) })
.into(new SimpleTarget<Bitmap>() { .into(new SimpleTarget<Bitmap>() {
@Override @Override

16
app/src/main/java/fr/gouv/etalab/mastodon/services/LiveNotificationService.java
View File

@ -25,9 +25,6 @@ import android.os.IBinder;
import android.os.SystemClock; import android.os.SystemClock;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import android.support.v4.content.LocalBroadcastManager; import android.support.v4.content.LocalBroadcastManager;
import android.text.Spannable;
import android.text.style.ImageSpan;
import android.view.View;
import com.bumptech.glide.Glide; import com.bumptech.glide.Glide;
@ -43,7 +40,6 @@ import org.json.JSONObject;
import java.io.BufferedInputStream; import java.io.BufferedInputStream;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.InputStreamReader; import java.io.InputStreamReader;
@ -332,7 +328,12 @@ public class LiveNotificationService extends IntentService {
Glide.with(getApplicationContext()) Glide.with(getApplicationContext())
.asBitmap() .asBitmap()
.load(notification.getAccount().getAvatar()) .load(notification.getAccount().getAvatar())
.listener(new RequestListener() { .listener(new RequestListener<Bitmap>() {
@Override
public boolean onResourceReady(Bitmap resource, Object model, Target<Bitmap> target, DataSource dataSource, boolean isFirstResource) {
return false;
}
@Override @Override
public boolean onLoadFailed(@Nullable GlideException e, Object model, Target target, boolean isFirstResource) { public boolean onLoadFailed(@Nullable GlideException e, Object model, Target target, boolean isFirstResource) {
@ -346,11 +347,6 @@ public class LiveNotificationService extends IntentService {
} }
return false; return false;
} }
@Override
public boolean onResourceReady(Object resource, Object model, Target target, DataSource dataSource, boolean isFirstResource) {
return false;
}
}) })
.into(new SimpleTarget<Bitmap>() { .into(new SimpleTarget<Bitmap>() {
@Override @Override