From 7e25b3cd406b0ee02b46519c0c1afa260b190197 Mon Sep 17 00:00:00 2001 From: Julian Raufelder Date: Tue, 15 Feb 2022 10:40:22 +0100 Subject: [PATCH] Minor clean-up --- .../data/cloud/crypto/CryptoCloudContentRepository.kt | 3 +-- .../presentation/ui/activity/BrowseFilesActivity.kt | 6 +----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/data/src/main/java/org/cryptomator/data/cloud/crypto/CryptoCloudContentRepository.kt b/data/src/main/java/org/cryptomator/data/cloud/crypto/CryptoCloudContentRepository.kt index 09519341..76da4993 100644 --- a/data/src/main/java/org/cryptomator/data/cloud/crypto/CryptoCloudContentRepository.kt +++ b/data/src/main/java/org/cryptomator/data/cloud/crypto/CryptoCloudContentRepository.kt @@ -118,11 +118,10 @@ internal class CryptoCloudContentRepository(context: Context, cloudContentReposi } cryptoImpl = when (cloud.vault.format) { - 7 -> CryptoImplVaultFormat7(context, cryptor, cloudContentRepository, vaultLocation, DirIdCacheFormat7()) 8 -> CryptoImplVaultFormat8(context, cryptor, cloudContentRepository, vaultLocation, DirIdCacheFormat7(), cloud.vault.shorteningThreshold) + 7 -> CryptoImplVaultFormat7(context, cryptor, cloudContentRepository, vaultLocation, DirIdCacheFormat7()) 6, 5 -> CryptoImplVaultFormatPre7(context, cryptor, cloudContentRepository, vaultLocation, DirIdCacheFormatPre7()) else -> throw IllegalStateException(String.format("No CryptoImpl for vault format %d.", cloud.vault.format)) } } - } diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/activity/BrowseFilesActivity.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/activity/BrowseFilesActivity.kt index bd49f2d2..6ebb9189 100644 --- a/presentation/src/main/java/org/cryptomator/presentation/ui/activity/BrowseFilesActivity.kt +++ b/presentation/src/main/java/org/cryptomator/presentation/ui/activity/BrowseFilesActivity.kt @@ -124,11 +124,7 @@ class BrowseFilesActivity : BaseActivity(), // override fun onReceive(context: Context, intent: Intent) { finish() } - } - - finishActivityDueToScreenLockEventReceiver?.let { - LocalBroadcastManager.getInstance(this).registerReceiver(it, IntentFilter(CryptorsService.SCREEN_AND_VAULT_LOCKED)) - } + }.also { LocalBroadcastManager.getInstance(this).registerReceiver(it, IntentFilter(CryptorsService.SCREEN_AND_VAULT_LOCKED)) } } override fun onBackPressed() {