Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Thumbnail for upload #746

Merged
merged 19 commits into from
Jan 14, 2015
Merged

Thumbnail for upload #746

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
462d032
Temporary fix of missing escape for apostrophe
tobiasKaminsky Nov 18, 2014
b2158a8
Merge branch 'develop' of git@github.com:owncloud/android.git into
tobiasKaminsky Nov 21, 2014
d05d736
- thumbnails on browsing local files during upload
tobiasKaminsky Nov 23, 2014
8364865
restore file
tobiasKaminsky Nov 23, 2014
a710797
- bugfix
tobiasKaminsky Nov 25, 2014
6e3d3cd
Merge branch 'develop' into thumbnailForUpload
jabarros Dec 19, 2014
0d6320a
Move isImage method to BitmapUtils class
jabarros Dec 29, 2014
2319a52
Merge branch 'develop' into thumbnailForUpload
jabarros Dec 29, 2014
fe5c6b6
Refactor ThumbnailsCacheManager to reduce repeated code
jabarros Dec 29, 2014
cd1a150
Create getThumbnailDimension and add some comments
jabarros Dec 29, 2014
6caad2b
Fixed. Icons which have extensions in UpperCase, in the uploads view …
jabarros Dec 30, 2014
fa159e4
Fix. Some icons are not correct. Showed default file icon when there …
jabarros Dec 31, 2014
643162c
Consider application/xml for XML files
davivel Jan 8, 2015
cb5f8b3
Considered MIME types for .py, .js, and fixed .xls, .ppt, and some cl…
davivel Jan 8, 2015
74d4f53
Fixed icon for MIME type application/javascript
davivel Jan 9, 2015
cc15321
Fixed. In the upload view, videos does not have the correct icon
jabarros Jan 9, 2015
5d22883
Changes after CR
jabarros Jan 12, 2015
b7e80e6
Other minor changes after CR
jabarros Jan 12, 2015
6c70154
Merge branch 'develop' into thumbnailForUpload
jabarros Jan 12, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
322 changes: 189 additions & 133 deletions src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,8 @@
import android.graphics.Bitmap;
import android.graphics.Bitmap.CompressFormat;
import android.graphics.BitmapFactory;
import android.graphics.Matrix;
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable;
import android.media.ExifInterface;
import android.media.ThumbnailUtils;
import android.net.Uri;
import android.os.AsyncTask;
Expand Down Expand Up @@ -76,7 +74,7 @@ public class ThumbnailsCacheManager {
public static Bitmap mDefaultImg =
BitmapFactory.decodeResource(
MainApp.getAppContext().getResources(),
DisplayUtils.getResourceId("image/png", "default.png")
DisplayUtils.getFileTypeIconId("image/png", "default.png")
);


Expand Down Expand Up @@ -139,188 +137,246 @@ public static Bitmap getBitmapFromDiskCache(String key) {
return null;
}


public static boolean cancelPotentialWork(OCFile file, ImageView imageView) {
final ThumbnailGenerationTask bitmapWorkerTask = getBitmapWorkerTask(imageView);

if (bitmapWorkerTask != null) {
final OCFile bitmapData = bitmapWorkerTask.mFile;
// If bitmapData is not yet set or it differs from the new data
if (bitmapData == null || bitmapData != file) {
// Cancel previous task
bitmapWorkerTask.cancel(true);
} else {
// The same work is already in progress
return false;
}
}
// No task associated with the ImageView, or an existing task was cancelled
return true;
}

public static ThumbnailGenerationTask getBitmapWorkerTask(ImageView imageView) {
if (imageView != null) {
final Drawable drawable = imageView.getDrawable();
if (drawable instanceof AsyncDrawable) {
final AsyncDrawable asyncDrawable = (AsyncDrawable) drawable;
return asyncDrawable.getBitmapWorkerTask();
}
}
return null;
}

public static class ThumbnailGenerationTask extends AsyncTask<OCFile, Void, Bitmap> {
public static class ThumbnailGenerationTask extends AsyncTask<Object, Void, Bitmap> {
private final WeakReference<ImageView> mImageViewReference;
private static Account mAccount;
private OCFile mFile;
private Object mFile;
private FileDataStorageManager mStorageManager;



public ThumbnailGenerationTask(ImageView imageView, FileDataStorageManager storageManager, Account account) {
// Use a WeakReference to ensure the ImageView can be garbage collected
// Use a WeakReference to ensure the ImageView can be garbage collected
mImageViewReference = new WeakReference<ImageView>(imageView);
if (storageManager == null)
throw new IllegalArgumentException("storageManager must not be NULL");
mStorageManager = storageManager;
mAccount = account;
}

// Decode image in background.
public ThumbnailGenerationTask(ImageView imageView) {
// Use a WeakReference to ensure the ImageView can be garbage collected
mImageViewReference = new WeakReference<ImageView>(imageView);
}

@Override
protected Bitmap doInBackground(OCFile... params) {
protected Bitmap doInBackground(Object... params) {
Bitmap thumbnail = null;

try {
if (mAccount != null) {
AccountManager accountMgr = AccountManager.get(MainApp.getAppContext());

mServerVersion = accountMgr.getUserData(mAccount, Constants.KEY_OC_VERSION);
OwnCloudAccount ocAccount = new OwnCloudAccount(mAccount, MainApp.getAppContext());
mClient = OwnCloudClientManagerFactory.getDefaultSingleton().
getClientFor(ocAccount, MainApp.getAppContext());
}

mFile = params[0];
final String imageKey = String.valueOf(mFile.getRemoteId());

// Check disk cache in background thread
thumbnail = getBitmapFromDiskCache(imageKey);

// Not found in disk cache
if (thumbnail == null || mFile.needsUpdateThumbnail()) {
// Converts dp to pixel
Resources r = MainApp.getAppContext().getResources();

int px = (int) Math.round(r.getDimension(R.dimen.file_icon_size));

if (mFile.isDown()){
Bitmap bitmap = BitmapUtils.decodeSampledBitmapFromFile(
mFile.getStoragePath(), px, px);

if (bitmap != null) {
thumbnail = ThumbnailUtils.extractThumbnail(bitmap, px, px);

// Rotate image, obeying exif tag
thumbnail = BitmapUtils.rotateImage(thumbnail, mFile.getStoragePath());

// Add thumbnail to cache
addBitmapToCache(imageKey, thumbnail);

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In this point, the operation should split conditionally:

  if (mFile instanceof OCFile) {
    doOCFileInBackground()
}  else if (mFile instance of File) {
   doFileInBackground() 
} else {
   // error or just nothing
}

The final class will have barely the same number of lines, since most of this method is already different depending on a casting. But we will lose a lost of lines by removing AsynTaskFile and both implementations.

Just need to take care with the values that now are returned by getId() and `getTagId()``

mFile.setNeedsUpdateThumbnail(false);
mStorageManager.saveFile(mFile);
}

} else {
// Download thumbnail from server
if (mClient != null && mServerVersion != null) {
OwnCloudVersion serverOCVersion = new OwnCloudVersion(mServerVersion);
if (serverOCVersion.compareTo(new OwnCloudVersion(MINOR_SERVER_VERSION_FOR_THUMBS)) >= 0) {
try {
int status = -1;

String uri = mClient.getBaseUri() + "/index.php/apps/files/api/v1/thumbnail/" +
px + "/" + px + Uri.encode(mFile.getRemotePath(), "/");
Log_OC.d("Thumbnail", "URI: " + uri);
GetMethod get = new GetMethod(uri);
status = mClient.executeMethod(get);
if (status == HttpStatus.SC_OK) {
byte[] bytes = get.getResponseBody();
Bitmap bitmap = BitmapFactory.decodeByteArray(bytes, 0, bytes.length);
thumbnail = ThumbnailUtils.extractThumbnail(bitmap, px, px);

// Add thumbnail to cache
if (thumbnail != null) {
addBitmapToCache(imageKey, thumbnail);
}
}
} catch (Exception e) {
e.printStackTrace();
}
} else {
Log_OC.d(TAG, "Server too old");
}
}
}
if (mFile instanceof OCFile) {
thumbnail = doOCFileInBackground();
} else if (mFile instanceof File) {
thumbnail = doFileInBackground();
} else {
// do nothing
}

} catch (Throwable t) {
// the app should never break due to a problem with thumbnails
Log_OC.e(TAG, "Generation of thumbnail for " + mFile + " failed", t);
if (t instanceof OutOfMemoryError) {
System.gc();

}catch(Throwable t){
// the app should never break due to a problem with thumbnails
Log_OC.e(TAG, "Generation of thumbnail for " + mFile + " failed", t);
if (t instanceof OutOfMemoryError) {
System.gc();
}
}
}


return thumbnail;
}

protected void onPostExecute(Bitmap bitmap){
if (isCancelled()) {
bitmap = null;
}

if (mImageViewReference != null && bitmap != null) {
final ImageView imageView = mImageViewReference.get();
final ThumbnailGenerationTask bitmapWorkerTask =
getBitmapWorkerTask(imageView);
final ThumbnailGenerationTask bitmapWorkerTask = getBitmapWorkerTask(imageView);
if (this == bitmapWorkerTask && imageView != null) {
if (imageView.getTag().equals(mFile.getFileId())) {
String tagId = "";
if (mFile instanceof OCFile){
tagId = String.valueOf(((OCFile)mFile).getFileId());
} else if (mFile instanceof File){
tagId = String.valueOf(((File)mFile).hashCode());
}
if (String.valueOf(imageView.getTag()).equals(tagId)) {
imageView.setImageBitmap(bitmap);
}
}
}
}

/**
* Add thumbnail to cache
* @param imageKey: thumb key
* @param bitmap: image for extracting thumbnail
* @param path: image path
* @param px: thumbnail dp
* @return Bitmap
*/
private Bitmap addThumbnailToCache(String imageKey, Bitmap bitmap, String path, int px){

Bitmap thumbnail = ThumbnailUtils.extractThumbnail(bitmap, px, px);

// Rotate image, obeying exif tag
thumbnail = BitmapUtils.rotateImage(thumbnail,path);

// Add thumbnail to cache
addBitmapToCache(imageKey, thumbnail);

return thumbnail;
}

/**
* Converts size of file icon from dp to pixel
* @return int
*/
private int getThumbnailDimension(){
// Converts dp to pixel
Resources r = MainApp.getAppContext().getResources();
return (int) Math.round(r.getDimension(R.dimen.file_icon_size));
}

private Bitmap doOCFileInBackground() {
Bitmap thumbnail = null;
OCFile file = (OCFile)mFile;

final String imageKey = String.valueOf(file.getRemoteId());

// Check disk cache in background thread
thumbnail = getBitmapFromDiskCache(imageKey);

// Not found in disk cache
if (thumbnail == null || file.needsUpdateThumbnail()) {

int px = getThumbnailDimension();

if (file.isDown()) {
Bitmap bitmap = BitmapUtils.decodeSampledBitmapFromFile(
file.getStoragePath(), px, px);

if (bitmap != null) {
thumbnail = addThumbnailToCache(imageKey, bitmap, file.getStoragePath(), px);

file.setNeedsUpdateThumbnail(false);
mStorageManager.saveFile(file);
}

} else {
// Download thumbnail from server
if (mClient != null && mServerVersion != null) {
OwnCloudVersion serverOCVersion = new OwnCloudVersion(mServerVersion);
if (serverOCVersion.compareTo(new OwnCloudVersion(MINOR_SERVER_VERSION_FOR_THUMBS)) >= 0) {
try {
int status = -1;

String uri = mClient.getBaseUri() + "/index.php/apps/files/api/v1/thumbnail/" +
px + "/" + px + Uri.encode(file.getRemotePath(), "/");
Log_OC.d("Thumbnail", "URI: " + uri);
GetMethod get = new GetMethod(uri);
status = mClient.executeMethod(get);
if (status == HttpStatus.SC_OK) {
byte[] bytes = get.getResponseBody();
Bitmap bitmap = BitmapFactory.decodeByteArray(bytes, 0, bytes.length);
thumbnail = ThumbnailUtils.extractThumbnail(bitmap, px, px);

// Add thumbnail to cache
if (thumbnail != null) {
addBitmapToCache(imageKey, thumbnail);
}
}
} catch (Exception e) {
e.printStackTrace();
}
} else {
Log_OC.d(TAG, "Server too old");
}
}
}
}

return thumbnail;

}

private Bitmap doFileInBackground() {
Bitmap thumbnail = null;
File file = (File)mFile;

final String imageKey = String.valueOf(file.hashCode());

// Check disk cache in background thread
thumbnail = getBitmapFromDiskCache(imageKey);

// Not found in disk cache
if (thumbnail == null) {

int px = getThumbnailDimension();

Bitmap bitmap = BitmapUtils.decodeSampledBitmapFromFile(
file.getAbsolutePath(), px, px);

if (bitmap != null) {
thumbnail = addThumbnailToCache(imageKey, bitmap, file.getPath(), px);
}
}
return thumbnail;
}

}



public static boolean cancelPotentialWork(Object file, ImageView imageView) {
final ThumbnailGenerationTask bitmapWorkerTask = getBitmapWorkerTask(imageView);

if (bitmapWorkerTask != null) {
final Object bitmapData = bitmapWorkerTask.mFile;
// If bitmapData is not yet set or it differs from the new data
if (bitmapData == null || bitmapData != file) {
// Cancel previous task
bitmapWorkerTask.cancel(true);
} else {
// The same work is already in progress
return false;
}
}
// No task associated with the ImageView, or an existing task was cancelled
return true;
}

public static ThumbnailGenerationTask getBitmapWorkerTask(ImageView imageView) {
if (imageView != null) {
final Drawable drawable = imageView.getDrawable();
if (drawable instanceof AsyncDrawable) {
final AsyncDrawable asyncDrawable = (AsyncDrawable) drawable;
return asyncDrawable.getBitmapWorkerTask();
}
}
return null;
}

public static class AsyncDrawable extends BitmapDrawable {
private final WeakReference<ThumbnailGenerationTask> bitmapWorkerTaskReference;

public AsyncDrawable(
Resources res, Bitmap bitmap, ThumbnailGenerationTask bitmapWorkerTask
) {
) {

super(res, bitmap);
bitmapWorkerTaskReference =
new WeakReference<ThumbnailGenerationTask>(bitmapWorkerTask);
new WeakReference<ThumbnailGenerationTask>(bitmapWorkerTask);
}

public ThumbnailGenerationTask getBitmapWorkerTask() {
return bitmapWorkerTaskReference.get();
}
}


/**
* Remove from cache the remoteId passed
* @param fileRemoteId: remote id of mFile passed
*/
public static void removeFileFromCache(String fileRemoteId){
synchronized (mThumbnailsDiskCacheLock) {
if (mThumbnailCache != null) {
mThumbnailCache.removeKey(fileRemoteId);
}
mThumbnailsDiskCacheLock.notifyAll(); // Wake any waiting threads
}
}

}
Loading