Instant upload when connected to WIFI or uploadOnlyUsingWifi is disabled

#181
This commit is contained in:
Julian Raufelder 2021-11-03 16:25:43 +01:00
parent b56a632525
commit b398a008b0
No known key found for this signature in database
GPG Key ID: 17EE71F6634E381D

View File

@ -122,7 +122,7 @@ class CryptomatorApp : MultiDexApplication(), HasComponent<ApplicationComponent>
fun startAutoUpload() { fun startAutoUpload() {
val sharedPreferencesHandler = SharedPreferencesHandler(applicationContext()) val sharedPreferencesHandler = SharedPreferencesHandler(applicationContext())
if(sharedPreferencesHandler.usePhotoUpload()) { if (checkToStartAutoImageUpload(sharedPreferencesHandler)) {
val vault = applicationComponent.vaultRepository().load(sharedPreferencesHandler.photoUploadVault()) val vault = applicationComponent.vaultRepository().load(sharedPreferencesHandler.photoUploadVault())
if (vault.isUnlocked) { if (vault.isUnlocked) {
val cloud = applicationComponent.cloudRepository().decryptedViewOf(vault) val cloud = applicationComponent.cloudRepository().decryptedViewOf(vault)
@ -131,6 +131,11 @@ class CryptomatorApp : MultiDexApplication(), HasComponent<ApplicationComponent>
} }
} }
private fun checkToStartAutoImageUpload(sharedPreferencesHandler: SharedPreferencesHandler): Boolean {
return sharedPreferencesHandler.usePhotoUpload()
&& (!sharedPreferencesHandler.autoPhotoUploadOnlyUsingWifi() || applicationComponent.networkConnectionCheck().checkWifiOnAndConnected())
}
private fun setupLogging() { private fun setupLogging() {
setupLoggingFramework() setupLoggingFramework()
setup() setup()