From 38b208b20c4dbe1135d7106d860414f6d608c7cf Mon Sep 17 00:00:00 2001
From: Julian Raufelder <Julian@Raufelder.com>
Date: Fri, 15 Oct 2021 11:31:38 +0200
Subject: [PATCH] Revert "Upload instantly when auto upload enabled and vault
 unlocked (#181)"

This reverts commit 8ebee7bfc250bab850be4aa026dc4befb76dfd63.
---
 .../org/cryptomator/presentation/CryptomatorApp.kt  | 11 -----------
 .../presentation/service/AutoUploadService.java     |  2 +-
 .../presentation/service/PhotoContentJob.kt         |  9 ---------
 presentation/src/main/res/values/strings.xml        |  2 --
 presentation/src/main/res/xml/preferences.xml       |  6 ------
 .../cryptomator/util/SharedPreferencesHandler.kt    | 13 ++++---------
 6 files changed, 5 insertions(+), 38 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..630b07bc 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/CryptomatorApp.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/CryptomatorApp.kt
@@ -120,17 +120,6 @@ class CryptomatorApp : MultiDexApplication(), HasComponent<ApplicationComponent>
 		}, BIND_AUTO_CREATE)
 	}
 
-	fun startAutoUpload() {
-		val sharedPreferencesHandler = SharedPreferencesHandler(applicationContext())
-		if(sharedPreferencesHandler.usePhotoUpload()) {
-			val vault = applicationComponent.vaultRepository().load(sharedPreferencesHandler.photoUploadVault())
-			if(vault.isUnlocked) {
-				val cloud = applicationComponent.cloudRepository().decryptedViewOf(vault)
-				applicationContext().startService(AutoUploadService.startAutoUploadIntent(applicationContext(), cloud))
-			}
-		}
-	}
-
 	private fun setupLogging() {
 		setupLoggingFramework()
 		setup()
diff --git a/presentation/src/main/java/org/cryptomator/presentation/service/AutoUploadService.java b/presentation/src/main/java/org/cryptomator/presentation/service/AutoUploadService.java
index 452934c7..a56c9050 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/service/AutoUploadService.java
+++ b/presentation/src/main/java/org/cryptomator/presentation/service/AutoUploadService.java
@@ -212,7 +212,7 @@ public class AutoUploadService extends Service {
 	public void onCreate() {
 		super.onCreate();
 		Timber.tag("AutoUploadService").d("created");
-		notification = new AutoUploadNotification(this, 0);
+		notification = new AutoUploadNotification(this, 5);
 	}
 
 	@Override
diff --git a/presentation/src/main/java/org/cryptomator/presentation/service/PhotoContentJob.kt b/presentation/src/main/java/org/cryptomator/presentation/service/PhotoContentJob.kt
index d9d1e929..f70972bb 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/service/PhotoContentJob.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/service/PhotoContentJob.kt
@@ -13,7 +13,6 @@ import android.net.Uri
 import android.os.Handler
 import android.provider.MediaStore
 import org.cryptomator.domain.exception.FatalBackendException
-import org.cryptomator.presentation.CryptomatorApp
 import org.cryptomator.presentation.R
 import org.cryptomator.presentation.util.FileUtil
 import org.cryptomator.presentation.util.ResourceHelper
@@ -39,8 +38,6 @@ class PhotoContentJob : JobService() {
 
 		runningParams = params
 
-		var filesCaptured = false
-
 		params.triggeredContentAuthorities?.let {
 			if (params.triggeredContentUris != null) {
 				val ids = getIds(params)
@@ -52,8 +49,6 @@ class PhotoContentJob : JobService() {
 								fileUtil.addImageToAutoUploads(dir)
 								Timber.tag("PhotoContentJob").i("Added file to UploadList")
 								Timber.tag("PhotoContentJob").d(String.format("Added file to UploadList %s", dir))
-
-								filesCaptured = true
 							} catch (e: FatalBackendException) {
 								Timber.tag("PhotoContentJob").e(e, "Failed to add image to auto upload list")
 							} catch (e: SecurityException) {
@@ -70,10 +65,6 @@ class PhotoContentJob : JobService() {
 			}
 		} ?: Timber.tag("PhotoContentJob").w("No photos content")
 
-		if(filesCaptured && SharedPreferencesHandler(applicationContext).usePhotoUploadInstant()) {
-			(application as CryptomatorApp).startAutoUpload()
-		}
-
 		handler.post(worker)
 		return false
 	}
diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml
index 8a87b0b0..6fb9018d 100644
--- a/presentation/src/main/res/values/strings.xml
+++ b/presentation/src/main/res/values/strings.xml
@@ -244,8 +244,6 @@
 	<string name="screen_settings_section_auto_photo_upload_vault">Choose vault for upload</string>
 	<string name="screen_settings_section_auto_photo_upload_toggle">Activate</string>
 	<string name="screen_settings_section_auto_photo_upload_toggle_summary">Capture images in the background and once the selected vault is unlocked, start upload</string>
-	<string name="screen_settings_section_auto_photo_upload_toggle_instant_upload">Upload instant</string>
-	<string name="screen_settings_section_auto_photo_upload_toggle_instant_upload_summary">Upload directly if the vault is unlocked</string>
 	<string name="screen_settings_section_auto_photo_upload_only_wifi_toggle">Upload only using WIFI</string>
 	<string name="screen_settings_section_auto_photo_upload_including_videos">Upload videos</string>
 
diff --git a/presentation/src/main/res/xml/preferences.xml b/presentation/src/main/res/xml/preferences.xml
index be07dbd7..c1c98343 100644
--- a/presentation/src/main/res/xml/preferences.xml
+++ b/presentation/src/main/res/xml/preferences.xml
@@ -105,12 +105,6 @@
 			android:summary="@string/screen_settings_section_auto_photo_upload_toggle_summary"
 			android:title="@string/screen_settings_section_auto_photo_upload_toggle" />
 
-		<androidx.preference.SwitchPreferenceCompat
-			android:defaultValue="true"
-			android:key="photoUploadInstant"
-			android:summary="@string/screen_settings_section_auto_photo_upload_toggle_instant_upload_summary"
-			android:title="@string/screen_settings_section_auto_photo_upload_toggle_instant_upload" />
-
 		<androidx.preference.SwitchPreferenceCompat
 			android:defaultValue="true"
 			android:key="photoUploadOnlyUsingWifi"
diff --git a/util/src/main/java/org/cryptomator/util/SharedPreferencesHandler.kt b/util/src/main/java/org/cryptomator/util/SharedPreferencesHandler.kt
index eedee837..cff1080c 100644
--- a/util/src/main/java/org/cryptomator/util/SharedPreferencesHandler.kt
+++ b/util/src/main/java/org/cryptomator/util/SharedPreferencesHandler.kt
@@ -129,18 +129,14 @@ constructor(context: Context) : SharedPreferences.OnSharedPreferenceChangeListen
 		defaultSharedPreferences.clear()
 	}
 
-	fun usePhotoUpload(): Boolean {
-		return defaultSharedPreferences.getValue(PHOTO_UPLOAD, false)
-	}
-
-	fun usePhotoUploadInstant(): Boolean {
-		return defaultSharedPreferences.getValue(PHOTO_UPLOAD_INSTANT, true)
-	}
-
 	fun autoPhotoUploadOnlyUsingWifi(): Boolean {
 		return defaultSharedPreferences.getValue(PHOTO_UPLOAD_ONLY_USING_WIFI)
 	}
 
+	fun usePhotoUpload(): Boolean {
+		return defaultSharedPreferences.getValue(PHOTO_UPLOAD, false)
+	}
+
 	fun photoUploadVault(): Long {
 		return defaultSharedPreferences.getValue(PHOTO_UPLOAD_VAULT, 0)
 	}
@@ -253,7 +249,6 @@ constructor(context: Context) : SharedPreferences.OnSharedPreferenceChangeListen
 		const val SECURE_SCREEN = "secureScreen"
 		const val SCREEN_STYLE_MODE = "screenStyleMode"
 		const val PHOTO_UPLOAD = "photoUpload"
-		const val PHOTO_UPLOAD_INSTANT = "photoUploadInstant"
 		const val PHOTO_UPLOAD_ONLY_USING_WIFI = "photoUploadOnlyUsingWifi"
 		const val PHOTO_UPLOAD_VAULT = "photoUploadVault"
 		const val PHOTO_UPLOAD_FOLDER = "photoUploadFolder"