From fd24f1ed6c808e22c1221c57b7843c1a1e6f5a46 Mon Sep 17 00:00:00 2001
From: merkost <konstantinlikes@gmail.com>
Date: Sat, 22 Jul 2023 00:05:25 +1000
Subject: [PATCH] Improved sortFavourites readability

---
 .../pro/fragments/MyViewPagerFragment.kt      | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/fragments/MyViewPagerFragment.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/fragments/MyViewPagerFragment.kt
index 5207e519..66b60b8a 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/fragments/MyViewPagerFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/fragments/MyViewPagerFragment.kt
@@ -154,19 +154,16 @@ abstract class MyViewPagerFragment(context: Context, attributeSet: AttributeSet)
     }
 
     private fun List<Contact>.sortFavourites(shouldSort: Boolean = true): List<Contact> {
-        return if (shouldSort) {
-            val favoritesOrder = activity!!.config.favoritesContactsOrder
+        val favoritesOrder = activity?.config?.favoritesContactsOrder
+        if (!shouldSort || favoritesOrder.isNullOrEmpty()) {
+            return this
+        }
 
-            if (favoritesOrder.isEmpty()) {
-                return this
-            }
+        val orderList = Converters().jsonToStringList(favoritesOrder)
+        val map = orderList.withIndex().associate { it.value to it.index }
 
-            val orderList = Converters().jsonToStringList(favoritesOrder)
-            val map = orderList.withIndex().associate { it.value to it.index }
-
-            return sortedBy { map[it.id.toString()] }
-        } else {
-            this
+        return sortedBy { contact ->
+            map[contact.id.toString()]
         }
     }