Merge pull request #8 from aiya000/fix/generate-thumbnails-for-larger-pictures

Resolve generating thumbnails of larger pictures

Author: WheelyMcBones

data/src/main/java/org/cryptomator/data/cloud/crypto/CryptoImplDecorator.kt

@@ -427,18 +427,32 @@ abstract class CryptoImplDecorator(
 						}
 					}
 					thumbnailWriter.flush()
-					closeQuietly(thumbnailWriter)
 				}
 			} finally {
 				encryptedTmpFile.delete()
-				if (genThumbnail) {
-					futureThumbnail.get()
-				}
 				progressAware.onProgress(Progress.completed(DownloadState.decryption(cryptoFile)))
 			}
 
+			// Close thumbnail writer first, then wait for thumbnail generation to complete
+			if (genThumbnail) {
+				closeQuietly(thumbnailWriter)
+				try {
+					futureThumbnail.get(5, java.util.concurrent.TimeUnit.SECONDS) // Add timeout to prevent hanging
+				} catch (e: java.util.concurrent.TimeoutException) {
+					Timber.w("Thumbnail generation timed out for ${cryptoFile.name}")
+					futureThumbnail.cancel(true)
+				} catch (e: Exception) {
+					Timber.w(e, "Error waiting for thumbnail generation for ${cryptoFile.name}")
+				}
+			}
 			closeQuietly(thumbnailReader)
 		} catch (e: IOException) {
+			// Don't treat thumbnail-related pipe closed errors as fatal
+			if (e.message?.contains("Pipe closed") == true && genThumbnail) {
+				Timber.d("Pipe closed during thumbnail generation (expected): ${cryptoFile.name}")
+				// The file was successfully decrypted, just the thumbnail failed
+				return
+			}
 			throw FatalBackendException(e)
 		}
 	}
@@ -456,24 +470,68 @@ abstract class CryptoImplDecorator(
 			try {
 				val options = BitmapFactory.Options()
 				val thumbnailBitmap: Bitmap?
-				options.inSampleSize = 4 // pixel number reduced by a factor of 1/16
+
+				// Use aggressive sampling for memory efficiency with large images
+				// Estimate file size and adjust sample size accordingly
+				val fileSize = cryptoFile.size ?: 0L
+				val fileSizeMB = fileSize / (1024 * 1024)
+
+				// Calculate sample size based on file size to prevent OOM
+				var sampleSize = when {
+					fileSizeMB > 50 -> 16  // 1/256 of original size for very large files
+					fileSizeMB > 30 -> 12  // 1/144 of original size for large files
+					fileSizeMB > 20 -> 8   // 1/64 of original size for medium-large files
+					fileSizeMB > 10 -> 6   // 1/36 of original size for medium files
+					else -> 4              // 1/16 of original size for smaller files
+				}
+
+				options.inSampleSize = sampleSize
+				options.inPreferredConfig = Bitmap.Config.RGB_565 // Use less memory than ARGB_8888
+				options.inDither = false
+				options.inPurgeable = true // Allow system to purge bitmap from memory if needed
+				options.inInputShareable = true
+
+				Timber.d("Generating thumbnail for ${cryptoFile.name} (${fileSizeMB}MB) with sampleSize: $sampleSize")
+
 				val bitmap = BitmapFactory.decodeStream(thumbnailReader, null, options)
 				if (bitmap == null) {
 					closeQuietly(thumbnailReader)
+					Timber.w("Failed to decode bitmap for thumbnail generation: ${cryptoFile.name}")
 					return@submit
 				}
 
 				val thumbnailWidth = 100
 				val thumbnailHeight = 100
 				thumbnailBitmap = ThumbnailUtils.extractThumbnail(bitmap, thumbnailWidth, thumbnailHeight)
+
+				// Clean up the original bitmap to free memory immediately
+				if (bitmap != thumbnailBitmap) {
+					bitmap.recycle()
+				}
+
 				if (thumbnailBitmap != null) {
 					storeThumbnail(diskCache, cacheKey, thumbnailBitmap)
+					thumbnailBitmap.recycle() // Clean up thumbnail bitmap after storing
 				}
 				closeQuietly(thumbnailReader)
 
 				cryptoFile.thumbnail = diskCache[cacheKey]
+				Timber.d("Successfully generated thumbnail for ${cryptoFile.name}")
+			} catch (e: OutOfMemoryError) {
+				closeQuietly(thumbnailReader)
+				Timber.e(e, "OutOfMemoryError during thumbnail generation for large image: ${cryptoFile.name} (${(cryptoFile.size ?: 0L) / (1024 * 1024)}MB)")
+				// Try to recover by forcing garbage collection
+				System.gc()
+			} catch (e: java.io.IOException) {
+				closeQuietly(thumbnailReader)
+				if (e.message?.contains("Pipe closed") == true) {
+					Timber.d("Thumbnail generation stream closed (expected for large files): ${cryptoFile.name}")
+				} else {
+					Timber.w(e, "IOException during thumbnail generation for file: ${cryptoFile.name}")
+				}
 			} catch (e: Exception) {
-				Timber.e(e, "Bitmap generation crashed")
+				closeQuietly(thumbnailReader)
+				Timber.e(e, "Bitmap generation crashed for file: ${cryptoFile.name}")
 			}
 		}
 	}

presentation/src/main/AndroidManifest.xml

@@ -32,6 +32,7 @@
 		android:allowBackup="false"
 		android:icon="@mipmap/ic_launcher"
 		android:label="@string/app_name"
+		android:largeHeap="true"
 		android:requestLegacyExternalStorage="true"
 		android:supportsRtl="true"
 		android:theme="@style/AppTheme"

presentation/src/main/java/org/cryptomator/presentation/model/CloudFileModel.kt

@@ -11,7 +11,8 @@ class CloudFileModel(cloudFile: CloudFile, val icon: FileIcon) : CloudNodeModel<
 
 	val modified: Date? = cloudFile.modified
 	val size: Long? = cloudFile.size
-	var thumbnail : File? = if (cloudFile is CryptoFile) cloudFile.thumbnail else null
+	val thumbnail : File? 
+		get() = if (toCloudNode() is CryptoFile) (toCloudNode() as CryptoFile).thumbnail else null
 
 	constructor(cloudFileRenamed: ResultRenamed<CloudFile>, icon: FileIcon) : this(cloudFileRenamed.value(), icon) {
 		oldName = cloudFileRenamed.oldName

presentation/src/main/java/org/cryptomator/presentation/presenter/BrowseFilesPresenter.kt

@@ -205,6 +205,14 @@ class BrowseFilesPresenter @Inject constructor( //
 				.run(DefaultResultHandler())
 		}
 		setRefreshOnBackPressEnabled(enableRefreshOnBackpressSupplier.setInAction(false))
+
+		// Re-associate thumbnails for visible images when returning from image preview
+		val images = view?.renderedCloudNodes()?.filterIsInstance<CloudFileModel>()?.filter { file ->
+			isImageMediaType(file.name)
+		} ?: return
+		if (images.isNotEmpty()) {
+			associateThumbnails(images.take(20)) // Increased from 10 to 20 for better coverage
+		}
 	}
 
 	fun onWindowFocusChanged(hasFocus: Boolean) {

presentation/src/main/java/org/cryptomator/presentation/ui/activity/ImagePreviewActivity.kt

@@ -73,7 +73,17 @@ class ImagePreviewActivity : BaseActivity<ActivityImagePreviewBinding>(ActivityI
 			toggleFullScreen()
 			attachSystemUiVisibilityChangeListener()
 		} catch (e: FatalBackendException) {
-			showError(getString(R.string.error_generic))
+			// Check if it's a memory issue with large images
+			if (e.message?.contains("memory", ignoreCase = true) == true ||
+				e.cause is OutOfMemoryError ||
+				e.message?.contains("large", ignoreCase = true) == true) {
+				showError(getString(R.string.error_image_too_large))
+			} else {
+				showError(getString(R.string.error_generic))
+			}
+			finish()
+		} catch (e: OutOfMemoryError) {
+			showError(getString(R.string.error_image_too_large))
 			finish()
 		}
 	}

presentation/src/main/java/org/cryptomator/presentation/ui/fragment/ImagePreviewFragment.kt

@@ -83,7 +83,21 @@ class ImagePreviewFragment : Fragment() {
 		binding.imageView.let { imageView ->
 			imagePreviewFile?.let { imagePreviewFile ->
 				imageView.orientation = SubsamplingScaleImageView.ORIENTATION_USE_EXIF
-				imagePreviewFile.uri?.let { imageView.setImage(ImageSource.uri(it)) }
+				// Configure SubsamplingScaleImageView for better memory handling of large images
+				imageView.setMinimumTileDpi(160)
+				imageView.setDebug(false)
+				imageView.setDoubleTapZoomDpi(240)
+				imageView.setDoubleTapZoomDuration(500)
+				imageView.setPanLimit(SubsamplingScaleImageView.PAN_LIMIT_INSIDE)
+				// Remove the problematic line - SubsamplingScaleImageView will use default decoder
+				imagePreviewFile.uri?.let {
+					try {
+						imageView.setImage(ImageSource.uri(it))
+					} catch (e: OutOfMemoryError) {
+						// Handle OOM gracefully
+						presenter.onImagePreviewClicked() // This will show an error through the presenter
+					}
+				}
 			}
 		}
 	}

presentation/src/main/res/values-ja-rJP/strings.xml

@@ -4,6 +4,7 @@
 	<string name="share_with_label">暗号化</string>
 	<!-- # error messages -->
 	<string name="error_generic">エラーが発生しました</string>
+	<string name="error_image_too_large">画像が大きすぎて表示できません。より小さい画像をお試しください。</string>
 	<string name="error_authentication_failed">認証に失敗しました</string>
 	<string name="error_authentication_failed_re_authenticate">認証に失敗しました。%1$s を使用してログインしてください</string>
 	<string name="error_no_network_connection">ネットワーク接続がありません</string>

presentation/src/main/res/values/strings.xml

@@ -12,6 +12,7 @@
 
 	<!-- # error messages -->
 	<string name="error_generic">An error occurred</string>
+	<string name="error_image_too_large">Image is too large to display. Please try with a smaller image.</string>
 	<string name="error_authentication_failed">Authentication failed</string>
 	<string name="error_authentication_failed_re_authenticate">Authentication failed, please login using %1$s</string>
 	<string name="error_no_network_connection">No network connection</string>