mirror of
https://github.com/nextcloud/android.git
synced 2024-11-25 22:55:46 +03:00
fixed missing refresh of thumbnail after sync
This commit is contained in:
parent
8e87cc2bf4
commit
960ea3ceac
2 changed files with 31 additions and 7 deletions
|
@ -1541,6 +1541,7 @@ public class FileDisplayActivity extends HookActivity
|
||||||
OCFile syncedFile = operation.getLocalFile();
|
OCFile syncedFile = operation.getLocalFile();
|
||||||
onTransferStateChanged(syncedFile, true, true);
|
onTransferStateChanged(syncedFile, true, true);
|
||||||
invalidateOptionsMenu();
|
invalidateOptionsMenu();
|
||||||
|
refreshShowDetails();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -22,7 +22,6 @@
|
||||||
package com.owncloud.android.ui.fragment;
|
package com.owncloud.android.ui.fragment;
|
||||||
|
|
||||||
import android.accounts.Account;
|
import android.accounts.Account;
|
||||||
|
|
||||||
import android.graphics.Bitmap;
|
import android.graphics.Bitmap;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.view.LayoutInflater;
|
import android.view.LayoutInflater;
|
||||||
|
@ -37,6 +36,7 @@ import android.widget.ImageView;
|
||||||
import android.widget.ProgressBar;
|
import android.widget.ProgressBar;
|
||||||
import android.widget.TextView;
|
import android.widget.TextView;
|
||||||
|
|
||||||
|
import com.owncloud.android.MainApp;
|
||||||
import com.owncloud.android.R;
|
import com.owncloud.android.R;
|
||||||
import com.owncloud.android.datamodel.FileDataStorageManager;
|
import com.owncloud.android.datamodel.FileDataStorageManager;
|
||||||
import com.owncloud.android.datamodel.OCFile;
|
import com.owncloud.android.datamodel.OCFile;
|
||||||
|
@ -406,16 +406,39 @@ public class FileDetailFragment extends FileFragment implements OnClickListener
|
||||||
String printableMimetype = DisplayUtils.convertMIMEtoPrettyPrint(mimetype);
|
String printableMimetype = DisplayUtils.convertMIMEtoPrettyPrint(mimetype);
|
||||||
tv.setText(printableMimetype);
|
tv.setText(printableMimetype);
|
||||||
}
|
}
|
||||||
|
|
||||||
ImageView iv = (ImageView) getView().findViewById(R.id.fdIcon);
|
ImageView iv = (ImageView) getView().findViewById(R.id.fdIcon);
|
||||||
|
|
||||||
if (iv != null) {
|
if (iv != null) {
|
||||||
Bitmap thumbnail = null;
|
Bitmap thumbnail;
|
||||||
|
iv.setTag(file.getFileId());
|
||||||
|
|
||||||
if (file.isImage()) {
|
if (file.isImage()) {
|
||||||
String tagId = String.valueOf(file.getRemoteId());
|
String tagId = String.valueOf(file.getRemoteId());
|
||||||
thumbnail = ThumbnailsCacheManager.getBitmapFromDiskCache(tagId);
|
thumbnail = ThumbnailsCacheManager.getBitmapFromDiskCache(tagId);
|
||||||
}
|
|
||||||
if (thumbnail != null) {
|
if (thumbnail != null && !file.needsUpdateThumbnail()) {
|
||||||
// Display thumbnail
|
|
||||||
iv.setImageBitmap(thumbnail);
|
iv.setImageBitmap(thumbnail);
|
||||||
|
} else {
|
||||||
|
// generate new Thumbnail
|
||||||
|
if (ThumbnailsCacheManager.cancelPotentialWork(file, iv)) {
|
||||||
|
final ThumbnailsCacheManager.ThumbnailGenerationTask task =
|
||||||
|
new ThumbnailsCacheManager.ThumbnailGenerationTask(
|
||||||
|
iv, mContainerActivity.getStorageManager(), mAccount
|
||||||
|
);
|
||||||
|
if (thumbnail == null) {
|
||||||
|
thumbnail = ThumbnailsCacheManager.mDefaultImg;
|
||||||
|
}
|
||||||
|
final ThumbnailsCacheManager.AsyncDrawable asyncDrawable =
|
||||||
|
new ThumbnailsCacheManager.AsyncDrawable(
|
||||||
|
MainApp.getAppContext().getResources(),
|
||||||
|
thumbnail,
|
||||||
|
task
|
||||||
|
);
|
||||||
|
iv.setImageDrawable(asyncDrawable);
|
||||||
|
task.execute(file);
|
||||||
|
}
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
// Name of the file, to deduce the icon to use in case the MIME type is not precise enough
|
// Name of the file, to deduce the icon to use in case the MIME type is not precise enough
|
||||||
String filename = file.getFileName();
|
String filename = file.getFileName();
|
||||||
|
|
Loading…
Reference in a new issue