From ca1d02b281a74034a454f86d9e4cd0b2f90552de Mon Sep 17 00:00:00 2001
From: Nicolas Pomepuy <nicolas@videolabs.io>
Date: Tue, 1 Jul 2025 09:21:20 +0200
Subject: [PATCH] Feedback info: add a section to restore the user's settings

---
 .../src/org/videolan/vlc/gui/helpers/FeedbackUtil.kt         | 5 +++++
 .../videolan/vlc/gui/preferences/search/PreferenceParser.kt  | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/application/vlc-android/src/org/videolan/vlc/gui/helpers/FeedbackUtil.kt b/application/vlc-android/src/org/videolan/vlc/gui/helpers/FeedbackUtil.kt
index c2c75087f..9e2b802e7 100644
--- a/application/vlc-android/src/org/videolan/vlc/gui/helpers/FeedbackUtil.kt
+++ b/application/vlc-android/src/org/videolan/vlc/gui/helpers/FeedbackUtil.kt
@@ -40,6 +40,7 @@ import org.videolan.resources.VLCOptions
 import org.videolan.vlc.BuildConfig
 import org.videolan.vlc.R
 import org.videolan.vlc.gui.preferences.search.PreferenceParser
+import org.videolan.vlc.gui.preferences.search.PreferenceParser.getChangedPrefsJson
 import org.videolan.vlc.util.FileUtils
 import org.videolan.vlc.util.Permissions
 import java.io.BufferedWriter
@@ -144,6 +145,10 @@ object FeedbackUtil {
             append(Log.getStackTraceString(e))
         }
         append("____________________________\r\n")
+        append("Settings export/import (copy this line in a file to restore those settings)\r\n")
+        append("____________________________\r\n")
+        append("${PreferenceParser.getChangedPrefsJson(context)}\r\n")
+        append("____________________________\r\n")
         append("vlc options: ${VLCOptions.libOptions.joinToString(" ")}\r\n")
         append("____________________________\r\n")
     }
diff --git a/application/vlc-android/src/org/videolan/vlc/gui/preferences/search/PreferenceParser.kt b/application/vlc-android/src/org/videolan/vlc/gui/preferences/search/PreferenceParser.kt
index 186f8740b..7a666bd61 100644
--- a/application/vlc-android/src/org/videolan/vlc/gui/preferences/search/PreferenceParser.kt
+++ b/application/vlc-android/src/org/videolan/vlc/gui/preferences/search/PreferenceParser.kt
@@ -251,7 +251,7 @@ object PreferenceParser {
      *
      * @return a string of all the changed preferences
      */
-    private fun getChangedPrefsJson(context: Context) = buildString {
+    fun getChangedPrefsJson(context: Context) = buildString {
         append("{")
         val allChangedPrefs = getAllChangedPrefs(context)
         addAllOtherPrefs(context, allChangedPrefs)