[Android] Settings restore: prevent opening the restart dialog too soon

Nicolas Pomepuy git at videolan.org
Wed Jul 23 11:41:54 UTC 2025


vlc-android | branch: master | Nicolas Pomepuy <nicolas at videolabs.io> | Thu Jul  3 13:21:13 2025 +0200| [2b326a4fb912ee53bfab00369306486093d6516e] | committer: Nicolas Pomepuy

Settings restore: prevent opening the restart dialog too soon

> https://code.videolan.org/videolan/vlc-android/commit/2b326a4fb912ee53bfab00369306486093d6516e
---

 .../television/ui/preferences/PreferencesAdvanced.kt       |  2 +-
 .../videolan/vlc/gui/preferences/PreferencesAdvanced.kt    | 14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/application/television/src/main/java/org/videolan/television/ui/preferences/PreferencesAdvanced.kt b/application/television/src/main/java/org/videolan/television/ui/preferences/PreferencesAdvanced.kt
index 5b48e7bac0..0cf7d87e57 100644
--- a/application/television/src/main/java/org/videolan/television/ui/preferences/PreferencesAdvanced.kt
+++ b/application/television/src/main/java/org/videolan/television/ui/preferences/PreferencesAdvanced.kt
@@ -341,8 +341,8 @@ class PreferencesAdvanced : BasePreferenceFragment(), SharedPreferences.OnShared
                             )
                         )
                     )
+                    UiTools.restartDialog(activity!!, true, RESTART_CODE, this)
                 }
-                UiTools.restartDialog(activity!!, true, RESTART_CODE, this)
             }
         }
     }
diff --git a/application/vlc-android/src/org/videolan/vlc/gui/preferences/PreferencesAdvanced.kt b/application/vlc-android/src/org/videolan/vlc/gui/preferences/PreferencesAdvanced.kt
index be67fd751b..fc027204e5 100644
--- a/application/vlc-android/src/org/videolan/vlc/gui/preferences/PreferencesAdvanced.kt
+++ b/application/vlc-android/src/org/videolan/vlc/gui/preferences/PreferencesAdvanced.kt
@@ -372,14 +372,16 @@ class PreferencesAdvanced : BasePreferenceFragment(), SharedPreferences.OnShared
         if (requestCode == FILE_PICKER_RESULT_CODE) {
             if (data.hasExtra(EXTRA_MRL)) {
                 lifecycleScope.launch {
-                    lifecycleScope.launch {
-                        PreferenceParser.restoreSettings(requireActivity(), Uri.parse(data.getStringExtra(
-                            EXTRA_MRL
-                        )))
-                    }
+                    PreferenceParser.restoreSettings(
+                        requireActivity(), Uri.parse(
+                            data.getStringExtra(
+                                EXTRA_MRL
+                            )
+                        )
+                    )
                     VLCInstance.restart()
+                    UiTools.restartDialog(requireActivity())
                 }
-                UiTools.restartDialog(requireActivity())
             }
         }
     }



More information about the Android mailing list