Skip to content

DocumentsStorageProvider: open thumbnail directly #6886

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

Merged
tobiasKaminsky merged 1 commit into from
Sep 7, 2020
Merged

DocumentsStorageProvider: open thumbnail directly #6886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 5 additions & 3 deletions src/main/java/com/owncloud/android/providers/DiskLruImageCacheFileProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,15 +70,17 @@ private OCFile getFile(Uri uri) {

@Override
public ParcelFileDescriptor openFile(@NonNull Uri uri, @NonNull String mode) throws FileNotFoundException {
OCFile ocFile = getFile(uri);
return getParcelFileDescriptorForOCFile(getFile(uri));
}

public static ParcelFileDescriptor getParcelFileDescriptorForOCFile(OCFile ocFile) throws FileNotFoundException {
Bitmap thumbnail = ThumbnailsCacheManager.getBitmapFromDiskCache(
String.valueOf(ThumbnailsCacheManager.PREFIX_RESIZED_IMAGE + ocFile.getRemoteId()));
ThumbnailsCacheManager.PREFIX_RESIZED_IMAGE + ocFile.getRemoteId());

// fallback to thumbnail
if (thumbnail == null) {
thumbnail = ThumbnailsCacheManager.getBitmapFromDiskCache(
String.valueOf(ThumbnailsCacheManager.PREFIX_THUMBNAIL + ocFile.getRemoteId()));
ThumbnailsCacheManager.PREFIX_THUMBNAIL + ocFile.getRemoteId());
}

// fallback to default image
Expand Down
14 changes: 6 additions & 8 deletions src/main/java/com/owncloud/android/providers/DocumentsStorageProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@
import com.owncloud.android.ui.activity.SettingsActivity;
import com.owncloud.android.utils.FileStorageUtils;
import com.owncloud.android.utils.MimeTypeUtil;
import com.owncloud.android.utils.UriUtils;

import org.nextcloud.providers.cursors.FileCursor;
import org.nextcloud.providers.cursors.RootCursor;
Expand Down Expand Up @@ -312,19 +311,18 @@ public AssetFileDescriptor openDocumentThumbnail(String documentId,
throw new FileNotFoundException("Context may not be null!");
}

Document document = toDocument(documentId);
OCFile file = toDocument(documentId).getFile();

boolean exists = ThumbnailsCacheManager.containsBitmap(ThumbnailsCacheManager.PREFIX_THUMBNAIL
+ document.getFile().getRemoteId());
+ file.getRemoteId());

if (!exists) {
ThumbnailsCacheManager.generateThumbnailFromOCFile(document.getFile());
ThumbnailsCacheManager.generateThumbnailFromOCFile(file);
}

Uri uri = Uri.parse(UriUtils.URI_CONTENT_SCHEME + context.getResources().getString(
R.string.image_cache_provider_authority) + document.getRemotePath());
Log.d(TAG, "open thumbnail, uri=" + uri);
return context.getContentResolver().openAssetFileDescriptor(uri, "r");
return new AssetFileDescriptor(DiskLruImageCacheFileProvider.getParcelFileDescriptorForOCFile(file),
0,
file.getFileLength());
}

@Override
Expand Down