Use default source path when opening the native picker to select the …

…camera uploads source folder
owncloud · Jul 8, 2021 · 090df6e · 090df6e
1 parent 0bd31c5
commit 090df6e
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/...com/owncloud/android/presentation/ui/settings/fragments/SettingsPictureUploadsFragment.kt b/...com/owncloud/android/presentation/ui/settings/fragments/SettingsPictureUploadsFragment.kt
@@ -163,6 +163,7 @@ class SettingsPictureUploadsFragment : PreferenceFragmentCompat() {
 
         prefPictureUploadsSourcePath?.setOnPreferenceClickListener {
             var sourcePath = picturesViewModel.getPictureUploadsSourcePath()
+                .takeUnless { it.isNullOrBlank() } ?: picturesViewModel.getDefaultSourcePath()
             if (!sourcePath.endsWith(File.separator)) {
                 sourcePath += File.separator
             }

diff --git a/...a/com/owncloud/android/presentation/ui/settings/fragments/SettingsVideoUploadsFragment.kt b/...a/com/owncloud/android/presentation/ui/settings/fragments/SettingsVideoUploadsFragment.kt
@@ -163,6 +163,7 @@ class SettingsVideoUploadsFragment : PreferenceFragmentCompat() {
 
         prefVideoUploadsSourcePath?.setOnPreferenceClickListener {
             var sourcePath = videosViewModel.getVideoUploadsSourcePath()
+                .takeUnless { it.isNullOrBlank() } ?: videosViewModel.getDefaultCameraSourcePath()
             if (!sourcePath.endsWith(File.separator)) {
                 sourcePath += File.separator
             }

diff --git a/.../com/owncloud/android/presentation/viewmodels/settings/SettingsPictureUploadsViewModel.kt b/.../com/owncloud/android/presentation/viewmodels/settings/SettingsPictureUploadsViewModel.kt
@@ -99,7 +99,9 @@ class SettingsPictureUploadsViewModel(
 
     fun getPictureUploadsPath() = _pictureUploads.value?.uploadPath ?: PREF__CAMERA_UPLOADS_DEFAULT_PATH
 
-    fun getPictureUploadsSourcePath(): String = _pictureUploads.value?.sourcePath ?: getDefaultCameraSourcePath()
+    fun getPictureUploadsSourcePath(): String? = _pictureUploads.value?.sourcePath
+
+    fun getDefaultSourcePath(): String = getDefaultCameraSourcePath()
 
     fun handleSelectPictureUploadsPath(data: Intent?) {
         val folderToUpload = data?.getParcelableExtra<OCFile>(UploadPathActivity.EXTRA_FOLDER)
@@ -134,7 +136,7 @@ class SettingsPictureUploadsViewModel(
         // If the source path has changed, update camera uploads last sync
         var previousSourcePath = _pictureUploads.value?.sourcePath ?: getDefaultCameraSourcePath()
 
-        previousSourcePath = previousSourcePath?.trimEnd(File.separatorChar)
+        previousSourcePath = previousSourcePath.trimEnd(File.separatorChar)
 
         viewModelScope.launch(coroutinesDispatcherProvider.io) {
             savePictureUploadsConfigurationUseCase.execute(
@@ -163,7 +165,7 @@ class SettingsPictureUploadsViewModel(
         FolderBackUpConfiguration(
             accountName = accountName ?: accountProvider.getCurrentOwnCloudAccount()!!.name,
             behavior = behavior ?: FolderBackUpConfiguration.Behavior.COPY,
-            sourcePath = sourcePath ?: getDefaultCameraSourcePath(),
+            sourcePath = sourcePath.orEmpty(),
             uploadPath = uploadPath ?: PREF__CAMERA_UPLOADS_DEFAULT_PATH,
             wifiOnly = wifiOnly ?: false,
             lastSyncTimestamp = timestamp ?: System.currentTimeMillis(),

diff --git a/...va/com/owncloud/android/presentation/viewmodels/settings/SettingsVideoUploadsViewModel.kt b/...va/com/owncloud/android/presentation/viewmodels/settings/SettingsVideoUploadsViewModel.kt
@@ -37,7 +37,7 @@ import com.owncloud.android.providers.AccountProvider
 import com.owncloud.android.providers.CoroutinesDispatcherProvider
 import com.owncloud.android.providers.WorkManagerProvider
 import com.owncloud.android.ui.activity.UploadPathActivity
-import com.owncloud.android.utils.FileStorageUtils.getDefaultCameraSourcePath
+import com.owncloud.android.utils.FileStorageUtils
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.launch
 import java.io.File
@@ -99,7 +99,9 @@ class SettingsVideoUploadsViewModel(
 
     fun getVideoUploadsPath() = _videoUploads.value?.uploadPath ?: PREF__CAMERA_UPLOADS_DEFAULT_PATH
 
-    fun getVideoUploadsSourcePath(): String = _videoUploads.value?.sourcePath ?: getDefaultCameraSourcePath()
+    fun getVideoUploadsSourcePath(): String? = _videoUploads.value?.sourcePath
+
+    fun getDefaultCameraSourcePath(): String = FileStorageUtils.getDefaultCameraSourcePath()
 
     fun handleSelectVideoUploadsPath(data: Intent?) {
         val folderToUpload = data?.getParcelableExtra<OCFile>(UploadPathActivity.EXTRA_FOLDER)
@@ -134,7 +136,7 @@ class SettingsVideoUploadsViewModel(
         // If the source path has changed, update camera uploads last sync
         var previousSourcePath = _videoUploads.value?.sourcePath ?: getDefaultCameraSourcePath()
 
-        previousSourcePath = previousSourcePath?.trimEnd(File.separatorChar)
+        previousSourcePath = previousSourcePath.trimEnd(File.separatorChar)
 
         viewModelScope.launch(coroutinesDispatcherProvider.io) {
             saveVideoUploadsConfigurationUseCase.execute(
@@ -163,7 +165,7 @@ class SettingsVideoUploadsViewModel(
         FolderBackUpConfiguration(
             accountName = accountName ?: accountProvider.getCurrentOwnCloudAccount()!!.name,
             behavior = behavior ?: FolderBackUpConfiguration.Behavior.COPY,
-            sourcePath = sourcePath ?: getDefaultCameraSourcePath(),
+            sourcePath = sourcePath.orEmpty(),
             uploadPath = uploadPath ?: PREF__CAMERA_UPLOADS_DEFAULT_PATH,
             wifiOnly = wifiOnly ?: false,
             lastSyncTimestamp = timestamp ?: System.currentTimeMillis(),