Skip to content

refactor(thumbnails): simplify doResizedImageInBackground logic #15974

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
merged 2 commits into from
Nov 26, 2025
+56 −57
Merged

refactor(thumbnails): simplify doResizedImageInBackground logic #15974

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb5e54d
refactor(thumbnails): simplify doResizedImageInBackground logic
alperozturk96 Nov 17, 2025
cde2375
refactor(thumbnails): simplify doResizedImageInBackground logic
alperozturk96 Nov 17, 2025
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
7 changes: 7 additions & 0 deletions app/src/main/java/com/nextcloud/utils/extensions/OwnCloudClientExtensions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,10 @@ fun OwnCloudClient.toNextcloudClient(context: Context): NextcloudClient = OwnClo
context,
isFollowRedirects
)

fun OwnCloudClient.getPreviewEndpoint(localFileId: Long, x: Int, y: Int): String = baseUri
.toString() +
"/index.php/core/preview?fileId=" +
localFileId +
"&x=" + (x / 2) + "&y=" + (y / 2) +
"&a=1&mode=cover&forceIcon=0"
106 changes: 49 additions & 57 deletions app/src/main/java/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
import com.nextcloud.client.account.User;
import com.nextcloud.client.network.ConnectivityService;
import com.nextcloud.utils.BitmapExtensionsKt;
import com.nextcloud.utils.extensions.OwnCloudClientExtensionsKt;
import com.owncloud.android.MainApp;
import com.owncloud.android.R;
import com.owncloud.android.lib.common.OwnCloudAccount;
Expand Down Expand Up @@ -1404,78 +1405,69 @@ public static void clearCache() {

private static Bitmap doResizedImageInBackground(OCFile file, FileDataStorageManager storageManager) {
Bitmap thumbnail;

String imageKey = PREFIX_RESIZED_IMAGE + file.getRemoteId();

// Check disk cache in background thread
thumbnail = getBitmapFromDiskCache(imageKey);
if (thumbnail != null && !file.isUpdateThumbnailNeeded()) {
Log_OC.d(TAG, "Thumbnail found in cache");
return thumbnail;
}

// Not found in disk cache
if (thumbnail == null || file.isUpdateThumbnailNeeded()) {
Point p = getScreenDimension();
int pxW = p.x;
int pxH = p.y;
Point p = getScreenDimension();
int pxW = p.x;
int pxH = p.y;

if (file.isDown()) {
Bitmap bitmap = BitmapUtils.decodeSampledBitmapFromFile(file.getStoragePath(), pxW, pxH);
if (file.isDown()) {
Bitmap bitmap = BitmapUtils.decodeSampledBitmapFromFile(file.getStoragePath(), pxW, pxH);
if (bitmap != null) {
if (PNG_MIMETYPE.equalsIgnoreCase(file.getMimeType())) {
bitmap = handlePNG(bitmap, pxW, pxH);
}
thumbnail = addThumbnailToCache(imageKey, bitmap, file.getStoragePath(), pxW, pxH);
file.setUpdateThumbnailNeeded(false);
}
} else if (mClient != null) {
GetMethod getMethod = null;

if (bitmap != null) {
// Handle PNG
if (PNG_MIMETYPE.equalsIgnoreCase(file.getMimeType())) {
bitmap = handlePNG(bitmap, pxW, pxH);
}
try {
String uri = OwnCloudClientExtensionsKt.getPreviewEndpoint(mClient, file.getLocalId(), pxW, pxH);
Log_OC.d(TAG, "generating resized image: " + file.getFileName() + " URI: " + uri);

thumbnail = addThumbnailToCache(imageKey, bitmap, file.getStoragePath(), pxW, pxH);
getMethod = new GetMethod(uri);
getMethod.getParams().setSoTimeout(READ_TIMEOUT);

file.setUpdateThumbnailNeeded(false);
int status = mClient.executeMethod(getMethod);
if (status == HttpStatus.SC_OK) {
try (InputStream inputStream = getMethod.getResponseBodyAsStream()) {
thumbnail = BitmapFactory.decodeStream(inputStream);
Log_OC.d(TAG, "resized image generated");
}
} else {
mClient.exhaustResponse(getMethod.getResponseBodyAsStream());
}

} else {
// Download thumbnail from server
if (mClient != null) {
GetMethod getMethod = null;
try {
String uri = mClient.getBaseUri() + "/index.php/core/preview?fileId="
+ file.getLocalId()
+ "&x=" + (pxW / 2) + "&y=" + (pxH / 2) + "&a=1&mode=cover&forceIcon=0";
Log_OC.d(TAG, "generate resized image: " + file.getFileName() + " URI: " + uri);
getMethod = new GetMethod(uri);

int status = mClient.executeMethod(getMethod);
if (status == HttpStatus.SC_OK) {
InputStream inputStream = getMethod.getResponseBodyAsStream();
thumbnail = BitmapFactory.decodeStream(inputStream);
} else {
mClient.exhaustResponse(getMethod.getResponseBodyAsStream());
}

// Handle PNG
if (thumbnail != null && PNG_MIMETYPE.equalsIgnoreCase(file.getMimeType())) {
thumbnail = handlePNG(thumbnail, thumbnail.getWidth(), thumbnail.getHeight());
}

// Add thumbnail to cache
if (thumbnail != null) {
Log_OC.d(TAG, "add resized image to cache: " + file.getFileName());
addBitmapToCache(imageKey, thumbnail);
}
if (thumbnail != null && PNG_MIMETYPE.equalsIgnoreCase(file.getMimeType())) {
thumbnail = handlePNG(thumbnail, thumbnail.getWidth(), thumbnail.getHeight());
}

} catch (Exception e) {
Log_OC.d(TAG, e.getMessage(), e);
} finally {
if (getMethod != null) {
getMethod.releaseConnection();
}
}
if (thumbnail != null) {
addBitmapToCache(imageKey, thumbnail);
}
} catch (Exception e) {
Log_OC.e(TAG, "doResizedBitmap: ", e);
} finally {
if (getMethod != null) {
getMethod.releaseConnection();
}
}
}

// resized dimensions and set update thumbnail needed to false to prevent rendering loop
if (thumbnail != null) {
file.setImageDimension(new ImageDimension(thumbnail.getWidth(), thumbnail.getHeight()));
file.setUpdateThumbnailNeeded(false);
storageManager.saveFile(file);
}
// resized dimensions and set update thumbnail needed to false to prevent rendering loop
if (thumbnail != null) {
file.setImageDimension(new ImageDimension(thumbnail.getWidth(), thumbnail.getHeight()));
file.setUpdateThumbnailNeeded(false);
storageManager.saveFile(file);
}

return thumbnail;
Expand Down
Loading