fix: set the correct account for automatic uploads when there are use…

…rs light
owncloud · Dec 3, 2024 · 31646a7 · 31646a7
1 parent 1c13299
commit 31646a7
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/...owncloud/android/presentation/settings/automaticuploads/SettingsPictureUploadsFragment.kt b/...owncloud/android/presentation/settings/automaticuploads/SettingsPictureUploadsFragment.kt
@@ -137,7 +137,15 @@ class SettingsPictureUploadsFragment : PreferenceFragmentCompat() {
                         enablePictureUploads(false, true)
                         showMessageInSnackbar(getString(R.string.prefs_automatic_uploads_not_available_users_light))
                     } else {
-                        selectedAccount = availableAccounts.first().accountName
+                        val currentAccount = manageAccountsViewModel.getCurrentAccount()?.name
+                        currentAccount?.let {
+                            selectedAccount = if (manageAccountsViewModel.checkUserLight(currentAccount)) {
+                                availableAccounts.first().accountName
+                            } else {
+                                currentAccount
+                            }
+                        }
+
                         picturesViewModel.pictureUploads.collect { pictureUploadsConfiguration ->
                             enablePictureUploads(pictureUploadsConfiguration != null, false)
                             pictureUploadsConfiguration?.let {

diff --git a/...m/owncloud/android/presentation/settings/automaticuploads/SettingsVideoUploadsFragment.kt b/...m/owncloud/android/presentation/settings/automaticuploads/SettingsVideoUploadsFragment.kt
@@ -134,7 +134,15 @@ class SettingsVideoUploadsFragment : PreferenceFragmentCompat() {
                         enableVideoUploads(false, true)
                         showMessageInSnackbar(getString(R.string.prefs_automatic_uploads_not_available_users_light))
                     } else {
-                        selectedAccount = availableAccounts.first().accountName
+                        val currentAccount = manageAccountsViewModel.getCurrentAccount()?.name
+                        currentAccount?.let {
+                            selectedAccount = if (manageAccountsViewModel.checkUserLight(currentAccount)) {
+                                availableAccounts.first().accountName
+                            } else {
+                                currentAccount
+                            }
+                        }
+
                         videosViewModel.videoUploads.collect { videoUploadsConfiguration ->
                             enableVideoUploads(videoUploadsConfiguration != null, false)
                             videoUploadsConfiguration?.let {