Gallery/Grid view

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

@@ -2,6 +2,7 @@ package org.cryptomator.data.cloud.crypto
 
 import org.cryptomator.domain.Cloud
 import org.cryptomator.domain.CloudFile
+import java.io.File
 import java.util.Date
 
 class CryptoFile(
@@ -12,6 +13,8 @@ class CryptoFile(
 	val cloudFile: CloudFile
 ) : CloudFile, CryptoNode {
 
+	var thumbnail : File? = null
+
 	override val cloud: Cloud?
 		get() = parent.cloud
 

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

@@ -1,6 +1,11 @@
 package org.cryptomator.data.cloud.crypto
 
 import android.content.Context
+import android.graphics.Bitmap
+import android.graphics.BitmapFactory
+import android.media.ThumbnailUtils
+import com.google.common.util.concurrent.ThreadFactoryBuilder
+import com.tomclaw.cache.DiskLruCache
 import org.cryptomator.cryptolib.api.Cryptor
 import org.cryptomator.cryptolib.common.DecryptingReadableByteChannel
 import org.cryptomator.cryptolib.common.EncryptingWritableByteChannel
@@ -9,6 +14,7 @@ import org.cryptomator.domain.Cloud
 import org.cryptomator.domain.CloudFile
 import org.cryptomator.domain.CloudFolder
 import org.cryptomator.domain.CloudNode
+import org.cryptomator.domain.CloudType
 import org.cryptomator.domain.exception.BackendException
 import org.cryptomator.domain.exception.CloudNodeAlreadyExistsException
 import org.cryptomator.domain.exception.EmptyDirFileException
@@ -24,18 +30,31 @@ import org.cryptomator.domain.usecases.cloud.DownloadState
 import org.cryptomator.domain.usecases.cloud.FileBasedDataSource.Companion.from
 import org.cryptomator.domain.usecases.cloud.Progress
 import org.cryptomator.domain.usecases.cloud.UploadState
+import org.cryptomator.util.SharedPreferencesHandler
+import org.cryptomator.util.ThumbnailsOption
+import org.cryptomator.util.file.LruFileCacheUtil
+import org.cryptomator.util.file.MimeType
+import org.cryptomator.util.file.MimeTypeMap
+import org.cryptomator.util.file.MimeTypes
 import java.io.ByteArrayOutputStream
+import java.io.Closeable
 import java.io.File
 import java.io.FileInputStream
 import java.io.FileOutputStream
 import java.io.IOException
 import java.io.OutputStream
+import java.io.PipedInputStream
+import java.io.PipedOutputStream
 import java.nio.ByteBuffer
 import java.nio.channels.Channels
 import java.util.LinkedList
 import java.util.Queue
 import java.util.UUID
+import java.util.concurrent.ExecutorService
+import java.util.concurrent.Executors
+import java.util.concurrent.Future
 import java.util.function.Supplier
+import timber.log.Timber
 
 
 abstract class CryptoImplDecorator(
@@ -50,6 +69,46 @@ abstract class CryptoImplDecorator(
 	@Volatile
 	private var root: RootCryptoFolder? = null
 
+	private val sharedPreferencesHandler = SharedPreferencesHandler(context)
+
+	private var diskLruCache: MutableMap<LruFileCacheUtil.Cache, DiskLruCache?> = mutableMapOf()
+
+	private val mimeTypes = MimeTypes(MimeTypeMap())
+
+	private val thumbnailExecutorService: ExecutorService by lazy {
+		val threadFactory = ThreadFactoryBuilder().setNameFormat("thumbnail-generation-thread-%d").build()
+		Executors.newFixedThreadPool(3, threadFactory)
+	}
+
+	protected fun getLruCacheFor(type: CloudType): DiskLruCache? {
+		return getOrCreateLruCache(getCacheTypeFromCloudType(type), sharedPreferencesHandler.lruCacheSize())
+	}
+
+	private fun getOrCreateLruCache(key: LruFileCacheUtil.Cache, cacheSize: Int): DiskLruCache? {
+		return diskLruCache.computeIfAbsent(key) {
+			val where = LruFileCacheUtil(context).resolve(it)
+			try {
+				DiskLruCache.create(where, cacheSize.toLong())
+			} catch (e: IOException) {
+				Timber.tag("CryptoImplDecorator").e(e, "Failed to setup LRU cache for $where.name")
+				null
+			}
+		}
+	}
+
+	private fun getCacheTypeFromCloudType(type: CloudType): LruFileCacheUtil.Cache {
+		return when (type) {
+			CloudType.DROPBOX -> LruFileCacheUtil.Cache.DROPBOX
+			CloudType.GOOGLE_DRIVE -> LruFileCacheUtil.Cache.GOOGLE_DRIVE
+			CloudType.ONEDRIVE -> LruFileCacheUtil.Cache.ONEDRIVE
+			CloudType.PCLOUD -> LruFileCacheUtil.Cache.PCLOUD
+			CloudType.WEBDAV -> LruFileCacheUtil.Cache.WEBDAV
+			CloudType.S3 -> LruFileCacheUtil.Cache.S3
+			CloudType.LOCAL -> LruFileCacheUtil.Cache.LOCAL
+			else -> throw IllegalStateException()
+		}
+	}
+
 	@Throws(BackendException::class)
 	abstract fun folder(cryptoParent: CryptoFolder, cleartextName: String): CryptoFolder
 
@@ -309,8 +368,21 @@ abstract class CryptoImplDecorator(
 	@Throws(BackendException::class)
 	fun read(cryptoFile: CryptoFile, data: OutputStream, progressAware: ProgressAware<DownloadState>) {
 		val ciphertextFile = cryptoFile.cloudFile
+
+		val diskCache = cryptoFile.cloudFile.cloud?.type()?.let { getLruCacheFor(it) }
+		val cacheKey = generateCacheKey(ciphertextFile)
+		val genThumbnail = isGenerateThumbnailsEnabled(diskCache, cryptoFile.name)
+
+		val thumbnailWriter = PipedOutputStream()
+		val thumbnailReader = PipedInputStream(thumbnailWriter)
+
 		try {
 			val encryptedTmpFile = readToTmpFile(cryptoFile, ciphertextFile, progressAware)
+
+			if (genThumbnail) {
+				startThumbnailGeneratorThread(diskCache, cacheKey, thumbnailReader)
+			}
+
 			progressAware.onProgress(Progress.started(DownloadState.decryption(cryptoFile)))
 			try {
 				Channels.newChannel(FileInputStream(encryptedTmpFile)).use { readableByteChannel ->
@@ -322,7 +394,12 @@ abstract class CryptoImplDecorator(
 						while (decryptingReadableByteChannel.read(buff).also { read = it } > 0) {
 							buff.flip()
 							data.write(buff.array(), 0, buff.remaining())
+							if (genThumbnail) {
+								thumbnailWriter.write(buff.array(), 0, buff.remaining())
+							}
+
 							decrypted += read.toLong()
+
 							progressAware
 								.onProgress(
 									Progress.progress(DownloadState.decryption(cryptoFile)) //
@@ -332,16 +409,88 @@ abstract class CryptoImplDecorator(
 								)
 						}
 					}
+					thumbnailWriter.flush()
+					closeQuietly(thumbnailWriter)
 				}
 			} finally {
 				encryptedTmpFile.delete()
 				progressAware.onProgress(Progress.completed(DownloadState.decryption(cryptoFile)))
 			}
+
+			closeQuietly(thumbnailReader)
 		} catch (e: IOException) {
 			throw FatalBackendException(e)
 		}
 	}
 
+	private fun closeQuietly(closeable: Closeable) {
+		try {
+			closeable.close();
+		} catch (e: IOException) {
+			// ignore
+		}
+	}
+
+	private fun startThumbnailGeneratorThread(diskCache: DiskLruCache?, cacheKey: String, thumbnailReader: PipedInputStream): Future<*> {
+		return thumbnailExecutorService.submit {
+			try {
+				val options = BitmapFactory.Options()
+				val thumbnailBitmap: Bitmap?
+				options.inSampleSize = 4 // pixel number reduced by a factor of 1/16
+
+				val bitmap = BitmapFactory.decodeStream(thumbnailReader, null, options)
+				val thumbnailWidth = 175
+				val thumbnailHeight = 175
+				thumbnailBitmap = ThumbnailUtils.extractThumbnail(bitmap, thumbnailWidth, thumbnailHeight)
+
+				if (thumbnailBitmap != null) {
+					storeThumbnail(diskCache, cacheKey, thumbnailBitmap)
+				}
+
+				closeQuietly(thumbnailReader)
+			} catch (e: Exception) {
+				Timber.e("Bitmap generation crashed")
+			}
+		}
+	}
+
+	protected fun generateCacheKey(cloudFile: CloudFile): String {
+		return buildString {
+			if (cloudFile.cloud?.id() != null)
+				this.append(cloudFile.cloud!!.id())
+			else
+				this.append("c") // "common"
+			this.append("-")
+			this.append(cloudFile.path.hashCode())
+		}
+	}
+
+	private fun isGenerateThumbnailsEnabled(cache: DiskLruCache?, fileName: String): Boolean {
+		return sharedPreferencesHandler.useLruCache() &&
+				sharedPreferencesHandler.generateThumbnails() != ThumbnailsOption.NEVER &&
+				cache != null &&
+				isImageMediaType(fileName)
+	}
+
+	private fun storeThumbnail(cache: DiskLruCache?, cacheKey: String, thumbnailBitmap: Bitmap) {
+		val thumbnailFile: File = File.createTempFile(UUID.randomUUID().toString(), ".thumbnail", internalCache)
+		thumbnailBitmap.compress(Bitmap.CompressFormat.JPEG, 100, thumbnailFile.outputStream())
+
+		try {
+			cache?.let {
+				LruFileCacheUtil.storeToLruCache(it, cacheKey, thumbnailFile)
+			} ?: Timber.tag("CryptoImplDecorator").e("Failed to store item in LRU cache")
+		} catch (e: IOException) {
+			Timber.tag("CryptoImplDecorator").e(e, "Failed to write the thumbnail in DiskLruCache")
+		}
+
+		thumbnailFile.delete()
+	}
+
+	protected fun isImageMediaType(filename: String): Boolean {
+		return (mimeTypes.fromFilename(filename) ?: MimeType.WILDCARD_MIME_TYPE).mediatype == "image"
+	}
+
 	@Throws(BackendException::class, IOException::class)
 	private fun readToTmpFile(cryptoFile: CryptoFile, file: CloudFile, progressAware: ProgressAware<DownloadState>): File {
 		val encryptedTmpFile = File.createTempFile(UUID.randomUUID().toString(), ".crypto", internalCache)

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

@@ -87,7 +87,6 @@ open class CryptoImplVaultFormat7 : CryptoImplDecorator {
 		val shortFileName = BaseEncoding.base64Url().encode(hash) + LONG_NODE_FILE_EXT
 		var dirFolder = cloudContentRepository.folder(getOrCreateCachingAwareDirIdInfo(cryptoParent).cloudFolder, shortFileName)
 
-		// if folder already exists in case of renaming
 		if (!cloudContentRepository.exists(dirFolder)) {
 			dirFolder = cloudContentRepository.create(dirFolder)
 		}
@@ -166,6 +165,18 @@ open class CryptoImplVaultFormat7 : CryptoImplDecorator {
 			}
 		}.map { node ->
 			ciphertextToCleartextNode(cryptoFolder, dirId, node)
+		}.onEach { cryptoNode ->
+			if (cryptoNode is CryptoFile && isImageMediaType(cryptoNode.name)) {
+				val cacheKey = generateCacheKey(cryptoNode.cloudFile)
+				cryptoNode.cloudFile.cloud?.type()?.let { cloudType ->
+					getLruCacheFor(cloudType)?.let { diskCache ->
+						val cacheFile = diskCache[cacheKey]
+						if (cacheFile != null) {
+							cryptoNode.thumbnail = cacheFile
+						}
+					}
+				}
+			}
 		}.toList().filterNotNull()
 	}
 
@@ -449,6 +460,15 @@ open class CryptoImplVaultFormat7 : CryptoImplDecorator {
 			} else {
 				cloudContentRepository.delete(node.cloudFile)
 			}
+
+			val cacheKey = generateCacheKey(node.cloudFile)
+			node.cloudFile.cloud?.type()?.let { cloudType ->
+				getLruCacheFor(cloudType)?.let { diskCache ->
+					if (diskCache[cacheKey] != null) {
+						diskCache.delete(cacheKey)
+					}
+				}
+			}
 		}
 	}
 
@@ -493,7 +513,7 @@ open class CryptoImplVaultFormat7 : CryptoImplDecorator {
 									cryptoFile,  //
 									cloudContentRepository.write( //
 										targetFile,  //
-										data.decorate(from(encryptedTmpFile)),
+										data.decorate(from(encryptedTmpFile)), //
 										UploadFileReplacingProgressAware(cryptoFile, progressAware),  //
 										replace,  //
 										encryptedTmpFile.length()

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

@@ -128,6 +128,18 @@ internal class CryptoImplVaultFormatPre7(
 			.filterIsInstance<CloudFile>()
 			.map { node ->
 				ciphertextToCleartextNode(cryptoFolder, dirId, node)
+			}.onEach { cryptoNode ->
+				if (cryptoNode is CryptoFile && isImageMediaType(cryptoNode.name)) {
+					val cacheKey = generateCacheKey(cryptoNode.cloudFile)
+					cryptoNode.cloudFile.cloud?.type()?.let { cloudType ->
+						getLruCacheFor(cloudType)?.let { diskCache ->
+							val cacheFile = diskCache[cacheKey]
+							if (cacheFile != null) {
+								cryptoNode.thumbnail = cacheFile
+							}
+						}
+					}
+				}
 			}
 			.toList()
 			.filterNotNull()
@@ -248,6 +260,15 @@ internal class CryptoImplVaultFormatPre7(
 			evictFromCache(node)
 		} else if (node is CryptoFile) {
 			cloudContentRepository.delete(node.cloudFile)
+
+			val cacheKey = generateCacheKey(node.cloudFile)
+			node.cloudFile.cloud?.type()?.let { cloudType ->
+				getLruCacheFor(cloudType)?.let { diskCache ->
+					if (diskCache[cacheKey] != null) {
+						diskCache.delete(cacheKey)
+					}
+				}
+			}
 		}
 	}
 

presentation/src/main/java/org/cryptomator/presentation/di/component/ActivityComponent.java

@@ -32,6 +32,7 @@
 import org.cryptomator.presentation.ui.fragment.ChooseCloudServiceFragment;
 import org.cryptomator.presentation.ui.fragment.CloudConnectionListFragment;
 import org.cryptomator.presentation.ui.fragment.CloudSettingsFragment;
+import org.cryptomator.presentation.ui.fragment.GalleryFragment;
 import org.cryptomator.presentation.ui.fragment.ImagePreviewFragment;
 import org.cryptomator.presentation.ui.fragment.S3AddOrChangeFragment;
 import org.cryptomator.presentation.ui.fragment.SetPasswordFragment;
@@ -75,6 +76,8 @@ public interface ActivityComponent {
 
 	void inject(BrowseFilesFragment browseFilesFragment);
 
+	void inject(GalleryFragment galleryFragment);
+
 	void inject(ChooseCloudServiceFragment chooseCloudServiceFragment);
 
 	void inject(SharedFilesActivity sharedFilesActivity);

presentation/src/main/java/org/cryptomator/presentation/intent/BrowseFilesIntent.java

@@ -12,6 +12,8 @@ public interface BrowseFilesIntent {
 
 	@Optional
 	String title();
+	@Optional
+	Long vaultId();
 
 	@Optional
 	ChooseCloudNodeSettings chooseCloudNodeSettings();

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

@@ -1,14 +1,17 @@
 package org.cryptomator.presentation.model
 
+import org.cryptomator.data.cloud.crypto.CryptoFile
 import org.cryptomator.domain.CloudFile
 import org.cryptomator.domain.usecases.ResultRenamed
 import org.cryptomator.presentation.util.FileIcon
+import java.io.File
 import java.util.Date
 
 class CloudFileModel(cloudFile: CloudFile, val icon: FileIcon) : CloudNodeModel<CloudFile>(cloudFile) {
 
 	val modified: Date? = cloudFile.modified
 	val size: Long? = cloudFile.size
+	var thumbnail : File? = if (cloudFile is CryptoFile) cloudFile.thumbnail else null
 
 	constructor(cloudFileRenamed: ResultRenamed<CloudFile>, icon: FileIcon) : this(cloudFileRenamed.value(), icon) {
 		oldName = cloudFileRenamed.oldName

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

@@ -1,5 +1,6 @@
 package org.cryptomator.presentation.model
 
+import android.graphics.Bitmap
 import org.cryptomator.domain.CloudNode
 import java.io.Serializable
 
@@ -8,6 +9,7 @@ abstract class CloudNodeModel<T : CloudNode> internal constructor(private val cl
 	var oldName: String? = null
 	var progress: ProgressModel? = null
 	var isSelected = false
+
 	val name: String
 		get() = cloudNode.name
 	val simpleName: String

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

@@ -141,6 +141,7 @@ class AutoUploadChooseVaultPresenter @Inject constructor( //
 		requestActivityResult( //
 			ActivityResultCallbacks.onAutoUploadChooseLocation(vaultModel),  //
 			Intents.browseFilesIntent() //
+				.withVaultId(vaultModel.vaultId) //
 				.withFolder(decryptedRoot) //
 				.withTitle(vaultModel.name) //
 				.withChooseCloudNodeSettings( //