fix: prevent preference listeners from persisting values before dialog confirmation

- Return false in listeners that show confirmation dialogs to prevent
  SharedPreferences from being written before the user responds
- Add negativeButtonListener to picture/video upload disable dialogs
  to restore checkbox state when user declines
- Remove caching of old path in ScopedStorageProvider on renameTo()
  failure so migration can be retried on next call

Author: zerox80

opencloudApp/src/main/java/eu/opencloud/android/presentation/settings/automaticuploads/SettingsPictureUploadsFragment.kt

@@ -185,9 +185,12 @@ class SettingsPictureUploadsFragment : PreferenceFragmentCompat() {
                         picturesViewModel.disablePictureUploads()
                         prefEnablePictureUploads?.isChecked = false
                     },
-                    negativeButtonText = getString(R.string.common_no)
+                    negativeButtonText = getString(R.string.common_no),
+                    negativeButtonListener = { _, _ ->
+                        prefEnablePictureUploads?.isChecked = true
+                    }
                 )
-                true
+                false
             }
         }
 

opencloudApp/src/main/java/eu/opencloud/android/presentation/settings/automaticuploads/SettingsVideoUploadsFragment.kt

@@ -183,9 +183,12 @@ class SettingsVideoUploadsFragment : PreferenceFragmentCompat() {
                         videosViewModel.disableVideoUploads()
                         prefEnableVideoUploads?.isChecked = false
                     },
-                    negativeButtonText = getString(R.string.common_no)
+                    negativeButtonText = getString(R.string.common_no),
+                    negativeButtonListener = { _, _ ->
+                        prefEnableVideoUploads?.isChecked = true
+                    }
                 )
-                true
+                false
             }
         }
 

opencloudApp/src/main/java/eu/opencloud/android/presentation/settings/security/SettingsSecurityFragment.kt

@@ -245,7 +245,7 @@ class SettingsSecurityFragment : PreferenceFragmentCompat() {
                         .show()
                         .avoidScreenshotsIfNeeded()
                 }
-                return@setOnPreferenceChangeListener true
+                return@setOnPreferenceChangeListener false
             }
             true
         }
@@ -269,7 +269,7 @@ class SettingsSecurityFragment : PreferenceFragmentCompat() {
                         .show()
                         .avoidScreenshotsIfNeeded()
                 }
-                return@setOnPreferenceChangeListener true
+                return@setOnPreferenceChangeListener false
             } else {
                 securityViewModel.setDownloadEverything(false)
                 workManagerProvider.cancelDownloadEverythingWorker()
@@ -294,7 +294,7 @@ class SettingsSecurityFragment : PreferenceFragmentCompat() {
                         .show()
                         .avoidScreenshotsIfNeeded()
                 }
-                return@setOnPreferenceChangeListener true
+                return@setOnPreferenceChangeListener false
             } else {
                 securityViewModel.setAutoSync(false)
                 workManagerProvider.cancelLocalFileSyncWorker()

opencloudData/src/main/java/eu/opencloud/android/data/providers/ScopedStorageProvider.kt

@@ -75,12 +75,10 @@ class ScopedStorageProvider(
                     return newPath
                 } else {
                     Timber.w("Failed to rename root folder from '$oldFolderName' to '$rootFolderName', using old path")
-                    rootFolderPath = oldPath
                     return oldPath
                 }
             } catch (e: Exception) {
                 Timber.e(e, "Failed to migrate root folder name")
-                rootFolderPath = oldPath
                 return oldPath
             }
         }