From 731379e00617ba1400b6a5d38c5e9e3e8e23b98b Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Sun, 26 Jun 2022 19:34:54 +0200
Subject: [PATCH] optimize playlist creation

---
 .../libretube/dialogs/CreatePlaylistDialog.kt | 10 +++++--
 .../com/github/libretube/fragments/Library.kt | 29 +++++++------------
 .../github/libretube/util/PreferenceHelper.kt |  6 ++--
 3 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/app/src/main/java/com/github/libretube/dialogs/CreatePlaylistDialog.kt b/app/src/main/java/com/github/libretube/dialogs/CreatePlaylistDialog.kt
index ce69b89ba..85c1f57a6 100644
--- a/app/src/main/java/com/github/libretube/dialogs/CreatePlaylistDialog.kt
+++ b/app/src/main/java/com/github/libretube/dialogs/CreatePlaylistDialog.kt
@@ -14,6 +14,7 @@ import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.setFragmentResult
 import androidx.lifecycle.lifecycleScope
 import com.github.libretube.R
+import com.github.libretube.fragments.Library
 import com.github.libretube.obj.Playlists
 import com.github.libretube.util.PreferenceHelper
 import com.github.libretube.util.RetrofitInstance
@@ -87,8 +88,13 @@ class CreatePlaylistDialog : DialogFragment() {
                     Toast.makeText(context, getString(R.string.unknown_error), Toast.LENGTH_SHORT)
                         .show()
                 }
-                // tell the Subscription Activity to fetch the playlists again
-                setFragmentResult("fetchPlaylists", bundleOf("" to ""))
+                // refresh the playlists in the library
+                try {
+                    val parent = parentFragment as Library
+                    parent.fetchPlaylists()
+                } catch (e: Exception) {
+                    Log.e(TAG, e.toString())
+                }
                 dismiss()
             }
         }
diff --git a/app/src/main/java/com/github/libretube/fragments/Library.kt b/app/src/main/java/com/github/libretube/fragments/Library.kt
index d459a85d2..4c844066e 100644
--- a/app/src/main/java/com/github/libretube/fragments/Library.kt
+++ b/app/src/main/java/com/github/libretube/fragments/Library.kt
@@ -53,19 +53,16 @@ class Library : Fragment() {
         if (token != "") {
             view.findViewById<ImageView>(R.id.boogh2).visibility = View.GONE
             view.findViewById<TextView>(R.id.textLike2).visibility = View.GONE
-            fetchPlaylists(view)
+            fetchPlaylists()
             refreshLayout.isEnabled = true
             refreshLayout.setOnRefreshListener {
-                fetchPlaylists(view)
+                fetchPlaylists()
             }
             val createPlaylistButton = view.findViewById<FloatingActionButton>(R.id.create_playlist)
             createPlaylistButton.setOnClickListener {
                 val newFragment = CreatePlaylistDialog()
                 newFragment.show(childFragmentManager, "Create Playlist")
             }
-            childFragmentManager.setFragmentResultListener("fetchPlaylists", this) { _, _ ->
-                fetchPlaylists(view)
-            }
         } else {
             refreshLayout.isEnabled = false
             view.findViewById<FloatingActionButton>(R.id.create_playlist).visibility = View.GONE
@@ -81,7 +78,7 @@ class Library : Fragment() {
         super.onResume()
     }
 
-    private fun fetchPlaylists(view: View) {
+    fun fetchPlaylists() {
         fun run() {
             refreshLayout.isRefreshing = true
             lifecycleScope.launchWhenCreated {
@@ -101,12 +98,8 @@ class Library : Fragment() {
                 }
                 if (response.isNotEmpty()) {
                     runOnUiThread {
-                        with(view.findViewById<ImageView>(R.id.boogh2)) {
-                            visibility = View.GONE
-                        }
-                        with(view.findViewById<TextView>(R.id.textLike2)) {
-                            visibility = View.GONE
-                        }
+                        view?.findViewById<ImageView>(R.id.boogh2)?.visibility = View.GONE
+                        view?.findViewById<TextView>(R.id.textLike2)?.visibility = View.GONE
                     }
                     val playlistsAdapter = PlaylistsAdapter(
                         response.toMutableList(),
@@ -115,13 +108,13 @@ class Library : Fragment() {
                     playlistRecyclerView.adapter = playlistsAdapter
                 } else {
                     runOnUiThread {
-                        with(view.findViewById<ImageView>(R.id.boogh2)) {
-                            visibility = View.VISIBLE
-                            setImageResource(R.drawable.ic_list)
+                        view?.findViewById<ImageView>(R.id.boogh2).apply {
+                            this?.visibility = View.VISIBLE
+                            this?.setImageResource(R.drawable.ic_list)
                         }
-                        with(view.findViewById<TextView>(R.id.textLike2)) {
-                            visibility = View.VISIBLE
-                            text = getString(R.string.emptyList)
+                        view?.findViewById<TextView>(R.id.textLike2).apply {
+                            this?.visibility = View.VISIBLE
+                            this?.text = getString(R.string.emptyList)
                         }
                     }
                 }
diff --git a/app/src/main/java/com/github/libretube/util/PreferenceHelper.kt b/app/src/main/java/com/github/libretube/util/PreferenceHelper.kt
index 79f67e39f..310a02578 100644
--- a/app/src/main/java/com/github/libretube/util/PreferenceHelper.kt
+++ b/app/src/main/java/com/github/libretube/util/PreferenceHelper.kt
@@ -55,14 +55,12 @@ object PreferenceHelper {
 
     fun clearPreferences(context: Context) {
         val editor = getDefaultSharedPreferencesEditor(context)
-        editor.clear()
-        editor.apply()
+        editor.clear().apply()
     }
 
     fun removePreference(context: Context, value: String?) {
         val editor = getDefaultSharedPreferencesEditor(context)
-        editor.remove(value)
-        editor.apply()
+        editor.remove(value).apply()
     }
 
     fun getToken(context: Context): String {