From b398a008b00537c01c8bbaddf8dea740ee88652a Mon Sep 17 00:00:00 2001
From: Julian Raufelder <Julian@Raufelder.com>
Date: Wed, 3 Nov 2021 16:25:43 +0100
Subject: [PATCH] Instant upload when connected to WIFI or uploadOnlyUsingWifi
 is disabled

#181
---
 .../java/org/cryptomator/presentation/CryptomatorApp.kt  | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/presentation/src/main/java/org/cryptomator/presentation/CryptomatorApp.kt b/presentation/src/main/java/org/cryptomator/presentation/CryptomatorApp.kt
index 120870fc..5abeb02f 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/CryptomatorApp.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/CryptomatorApp.kt
@@ -122,15 +122,20 @@ class CryptomatorApp : MultiDexApplication(), HasComponent<ApplicationComponent>
 
 	fun startAutoUpload() {
 		val sharedPreferencesHandler = SharedPreferencesHandler(applicationContext())
-		if(sharedPreferencesHandler.usePhotoUpload()) {
+		if (checkToStartAutoImageUpload(sharedPreferencesHandler)) {
 			val vault = applicationComponent.vaultRepository().load(sharedPreferencesHandler.photoUploadVault())
-			if(vault.isUnlocked) {
+			if (vault.isUnlocked) {
 				val cloud = applicationComponent.cloudRepository().decryptedViewOf(vault)
 				applicationContext().startService(AutoUploadService.startAutoUploadIntent(applicationContext(), cloud))
 			}
 		}
 	}
 
+	private fun checkToStartAutoImageUpload(sharedPreferencesHandler: SharedPreferencesHandler): Boolean {
+		return sharedPreferencesHandler.usePhotoUpload()
+				&& (!sharedPreferencesHandler.autoPhotoUploadOnlyUsingWifi() || applicationComponent.networkConnectionCheck().checkWifiOnAndConnected())
+	}
+
 	private fun setupLogging() {
 		setupLoggingFramework()
 		setup()