AtaraxiaDev/cryptomator-android
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Minor clean-up

Browse Source
This commit is contained in:
Julian Raufelder 2022-02-15 10:40:22 +01:00
parent bf1279743e
commit 7e25b3cd40
No known key found for this signature in database
GPG Key ID: 17EE71F6634E381D
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
data/src/main/java/org/cryptomator/data/cloud/crypto/CryptoCloudContentRepository.kt
View File

@ -118,11 +118,10 @@ internal class CryptoCloudContentRepository(context: Context, cloudContentReposi
} }
cryptoImpl = when (cloud.vault.format) { cryptoImpl = when (cloud.vault.format) {
7 -> CryptoImplVaultFormat7(context, cryptor, cloudContentRepository, vaultLocation, DirIdCacheFormat7())
8 -> CryptoImplVaultFormat8(context, cryptor, cloudContentRepository, vaultLocation, DirIdCacheFormat7(), cloud.vault.shorteningThreshold) 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()) 6, 5 -> CryptoImplVaultFormatPre7(context, cryptor, cloudContentRepository, vaultLocation, DirIdCacheFormatPre7())
else -> throw IllegalStateException(String.format("No CryptoImpl for vault format %d.", cloud.vault.format)) else -> throw IllegalStateException(String.format("No CryptoImpl for vault format %d.", cloud.vault.format))
} }
} }
} }

6
presentation/src/main/java/org/cryptomator/presentation/ui/activity/BrowseFilesActivity.kt
View File

@ -124,11 +124,7 @@ class BrowseFilesActivity : BaseActivity(), //
override fun onReceive(context: Context, intent: Intent) { override fun onReceive(context: Context, intent: Intent) {
finish() finish()
} }
} }.also { LocalBroadcastManager.getInstance(this).registerReceiver(it, IntentFilter(CryptorsService.SCREEN_AND_VAULT_LOCKED)) }
finishActivityDueToScreenLockEventReceiver?.let {
LocalBroadcastManager.getInstance(this).registerReceiver(it, IntentFilter(CryptorsService.SCREEN_AND_VAULT_LOCKED))
}
} }
override fun onBackPressed() { override fun onBackPressed() {