From b4100bd27c846059f41da9db5934cc329a1627f0 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Thu, 1 Dec 2022 14:43:19 +0100
Subject: [PATCH] fix some UI issues at the import/export page

---
 .../github/libretube/ui/dialogs/CreatePlaylistDialog.kt    | 7 +++----
 .../libretube/ui/preferences/BackupRestoreSettings.kt      | 2 +-
 .../main/java/com/github/libretube/util/ImportHelper.kt    | 2 +-
 app/src/main/res/xml/import_export_settings.xml            | 3 +--
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/github/libretube/ui/dialogs/CreatePlaylistDialog.kt b/app/src/main/java/com/github/libretube/ui/dialogs/CreatePlaylistDialog.kt
index 253925485..0053e60f3 100644
--- a/app/src/main/java/com/github/libretube/ui/dialogs/CreatePlaylistDialog.kt
+++ b/app/src/main/java/com/github/libretube/ui/dialogs/CreatePlaylistDialog.kt
@@ -31,10 +31,9 @@ class CreatePlaylistDialog(
             val listName = binding.playlistName.text.toString()
             if (listName != "") {
                 lifecycleScope.launchWhenCreated {
-                    PlaylistsHelper.createPlaylist(listName, requireContext().applicationContext) {
-                        onSuccess.invoke()
-                        dismiss()
-                    }
+                    PlaylistsHelper.createPlaylist(listName, requireContext().applicationContext)
+                    onSuccess.invoke()
+                    dismiss()
                 }
             } else {
                 Toast.makeText(context, R.string.emptyPlaylistName, Toast.LENGTH_LONG).show()
diff --git a/app/src/main/java/com/github/libretube/ui/preferences/BackupRestoreSettings.kt b/app/src/main/java/com/github/libretube/ui/preferences/BackupRestoreSettings.kt
index 5dee1296e..7db39b5e8 100644
--- a/app/src/main/java/com/github/libretube/ui/preferences/BackupRestoreSettings.kt
+++ b/app/src/main/java/com/github/libretube/ui/preferences/BackupRestoreSettings.kt
@@ -96,7 +96,7 @@ class BackupRestoreSettings : BasePreferenceFragment() {
 
         val exportPlaylists = findPreference<Preference>("export_playlists")
         exportPlaylists?.setOnPreferenceClickListener {
-            createPlaylistsFile.launch("subscriptions.json")
+            createPlaylistsFile.launch("playlists.json")
             true
         }
 
diff --git a/app/src/main/java/com/github/libretube/util/ImportHelper.kt b/app/src/main/java/com/github/libretube/util/ImportHelper.kt
index 562ae031a..ec2ee9ff3 100644
--- a/app/src/main/java/com/github/libretube/util/ImportHelper.kt
+++ b/app/src/main/java/com/github/libretube/util/ImportHelper.kt
@@ -117,7 +117,7 @@ class ImportHelper(
         playlistFile.playlists.orEmpty().forEach {
             CoroutineScope(Dispatchers.IO).launch {
                 playlistFile.playlists?.let {
-                    PlaylistsHelper.importPlaylists(it)
+                    PlaylistsHelper.importPlaylists(activity, it)
                 }
             }
         }
diff --git a/app/src/main/res/xml/import_export_settings.xml b/app/src/main/res/xml/import_export_settings.xml
index fcd65c2b1..a0ee3759e 100644
--- a/app/src/main/res/xml/import_export_settings.xml
+++ b/app/src/main/res/xml/import_export_settings.xml
@@ -21,9 +21,8 @@
 
         <Preference
             android:icon="@drawable/ic_download_filled"
-            android:summary="@string/import_playlists"
             app:key="import_playlists"
-            app:title="@string/import_from_yt" />
+            app:title="@string/import_playlists" />
 
         <Preference
             android:icon="@drawable/ic_upload"