From: tobiasKaminsky Date: Wed, 14 Oct 2015 18:10:01 +0000 (+0200) Subject: fixed missing refresh of thumbnail after sync X-Git-Tag: oc-android-1.9^2~50^2 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/960ea3ceacc539e0fcea0b36a36e34a9878cffd1?ds=inline;hp=--cc fixed missing refresh of thumbnail after sync --- 960ea3ceacc539e0fcea0b36a36e34a9878cffd1 diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java index 20bcdce4..240d146f 100644 --- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java +++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java @@ -1541,6 +1541,7 @@ public class FileDisplayActivity extends HookActivity OCFile syncedFile = operation.getLocalFile(); onTransferStateChanged(syncedFile, true, true); invalidateOptionsMenu(); + refreshShowDetails(); } } } diff --git a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java index f87ee0a0..b2e6464c 100644 --- a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java +++ b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java @@ -22,7 +22,6 @@ package com.owncloud.android.ui.fragment; import android.accounts.Account; - import android.graphics.Bitmap; import android.os.Bundle; import android.view.LayoutInflater; @@ -37,6 +36,7 @@ import android.widget.ImageView; import android.widget.ProgressBar; import android.widget.TextView; +import com.owncloud.android.MainApp; import com.owncloud.android.R; import com.owncloud.android.datamodel.FileDataStorageManager; import com.owncloud.android.datamodel.OCFile; @@ -406,17 +406,40 @@ public class FileDetailFragment extends FileFragment implements OnClickListener String printableMimetype = DisplayUtils.convertMIMEtoPrettyPrint(mimetype); tv.setText(printableMimetype); } + ImageView iv = (ImageView) getView().findViewById(R.id.fdIcon); + if (iv != null) { - Bitmap thumbnail = null; + Bitmap thumbnail; + iv.setTag(file.getFileId()); + if (file.isImage()) { String tagId = String.valueOf(file.getRemoteId()); thumbnail = ThumbnailsCacheManager.getBitmapFromDiskCache(tagId); - } - if (thumbnail != null) { - // Display thumbnail - iv.setImageBitmap(thumbnail); - } else { + + if (thumbnail != null && !file.needsUpdateThumbnail()) { + 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 { // Name of the file, to deduce the icon to use in case the MIME type is not precise enough String filename = file.getFileName(); iv.setImageResource(MimetypeIconUtil.getFileTypeIconId(mimetype, filename));