mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-26 23:28:42 +03:00
Code Issues Projects Releases Packages Wiki Activity

code review: use string instead of object to not having to do instance of checks

Browse source
This commit is contained in:
Andy Scherzinger 2016-06-25 16:23:43 +02:00
parent 78f1aa5f66
commit 30ab5a6b57
1 changed files with 6 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
View file

@ -350,11 +350,11 @@ public class ThumbnailsCacheManager {
}
public static class AvatarGenerationTask extends AsyncTask<Object, Void, Bitmap> {
public static class AvatarGenerationTask extends AsyncTask<String, Void, Bitmap> {
private final WeakReference<AvatarGenerationListener> mAvatarGenerationListener;
private final Object mCallContext;
private Account mAccount;
private Object mUsername;
private String mUsername;
public AvatarGenerationTask(AvatarGenerationListener avatarGenerationListener, Object callContext,
@ -367,7 +367,7 @@ public class ThumbnailsCacheManager {
}
@Override
protected Bitmap doInBackground(Object... params) {
protected Bitmap doInBackground(String... params) {
Bitmap thumbnail = null;
try {
@ -379,10 +379,7 @@ public class ThumbnailsCacheManager {
}
mUsername = params[0];
if (mUsername instanceof String) {
thumbnail = doAvatarInBackground();
}
thumbnail = doAvatarInBackground();
} catch(Throwable t){
// the app should never break due to a problem with avatars
@ -401,12 +398,8 @@ public class ThumbnailsCacheManager {
AvatarGenerationListener listener = mAvatarGenerationListener.get();
AvatarGenerationTask avatarWorkerTask = getAvatarWorkerTask(mCallContext);
if (this == avatarWorkerTask) {
String tagId = "";
if (mUsername instanceof String) {
tagId = (String) mUsername;
if (listener.shouldCallGeneratedCallback(tagId, mCallContext)) {
listener.avatarGenerated(new BitmapDrawable(bitmap), mCallContext);
}
if (listener.shouldCallGeneratedCallback(mUsername, mCallContext)) {
listener.avatarGenerated(new BitmapDrawable(bitmap), mCallContext);
}
}
}
@ -495,30 +488,6 @@ public class ThumbnailsCacheManager {
}
return avatar;
}
private Bitmap doFileInBackground() {
File file = (File) mUsername;
final String imageKey = String.valueOf(file.hashCode());
// Check disk cache in background thread
Bitmap thumbnail = getBitmapFromDiskCache(imageKey);
// Not found in disk cache
if (thumbnail == null) {
int px = getAvatarDimension();
Bitmap bitmap = BitmapUtils.decodeSampledBitmapFromFile(
file.getAbsolutePath(), px, px);
if (bitmap != null) {
thumbnail = addThumbnailToCache(imageKey, bitmap, file.getPath(), px);
}
}
return thumbnail;
}
}
public static boolean cancelPotentialThumbnailWork(Object file, ImageView imageView) {