projects
/
pub
/
Android
/
ownCloud.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'upstream/develop' into imageGrid
[pub/Android/ownCloud.git]
/
src
/
com
/
owncloud
/
android
/
datamodel
/
ThumbnailsCacheManager.java
diff --git
a/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
b/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
index
8a7268c
..
52bb3a7
100644
(file)
--- a/
src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
+++ b/
src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
@@
-275,10
+275,8
@@
public class ThumbnailsCacheManager {
final ImageView imageView = mImageViewReference.get();
final ThumbnailGenerationTask bitmapWorkerTask =
getBitmapWorkerTask(imageView);
final ImageView imageView = mImageViewReference.get();
final ThumbnailGenerationTask bitmapWorkerTask =
getBitmapWorkerTask(imageView);
- if (this == bitmapWorkerTask && imageView != null && imageView.getTag() != null && mFile != null) {
- if (imageView.getTag().equals(mFile.getFileId())) {
- imageView.setImageBitmap(bitmap);
- }
+ if (this == bitmapWorkerTask && imageView != null) {
+ imageView.setImageBitmap(bitmap);
}
}
}
}
}
}