From da7acb2c9f8d5b5f379d76eefb692fe7c27fa8b8 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sun, 8 Nov 2020 10:03:03 +0100
Subject: [PATCH] properly handle custom sorting

---
 .../applauncher/adapters/LaunchersAdapter.kt  | 20 ++++++++++---------
 .../applauncher/models/AppLauncher.kt         | 12 ++++++++++-
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/applauncher/adapters/LaunchersAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/applauncher/adapters/LaunchersAdapter.kt
index 0cf7e97..8d4969d 100644
--- a/app/src/main/kotlin/com/simplemobiletools/applauncher/adapters/LaunchersAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/applauncher/adapters/LaunchersAdapter.kt
@@ -93,16 +93,18 @@ class LaunchersAdapter(activity: SimpleActivity, val launchers: ArrayList<AppLau
     override fun onActionModeCreated() {}
 
     override fun onActionModeDestroyed() {
+        if (isChangingOrder) {
+            notifyDataSetChanged()
+            launchers.forEachIndexed { index, appLauncher ->
+                appLauncher.order = index + 1
+            }
+
+            launchers.forEach {
+                activity.dbHelper.updateLauncherOrder(it.id, it.order)
+            }
+        }
+
         isChangingOrder = false
-        notifyDataSetChanged()
-
-        launchers.forEachIndexed { index, appLauncher ->
-            appLauncher.order = index + 1
-        }
-
-        launchers.forEach {
-            activity.dbHelper.updateLauncherOrder(it.id, it.order)
-        }
     }
 
     private fun changeOrder() {
diff --git a/app/src/main/kotlin/com/simplemobiletools/applauncher/models/AppLauncher.kt b/app/src/main/kotlin/com/simplemobiletools/applauncher/models/AppLauncher.kt
index 1ba004f..aa52e0d 100644
--- a/app/src/main/kotlin/com/simplemobiletools/applauncher/models/AppLauncher.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/applauncher/models/AppLauncher.kt
@@ -16,7 +16,17 @@ data class AppLauncher(val id: Int, var title: String, val packageName: String,
     override fun compareTo(other: AppLauncher): Int {
         var result = when {
             sorting and SORT_BY_TITLE != 0 -> title.toLowerCase().compareTo(other.title.toLowerCase())
-            else -> order.compareTo(other.order)
+            else -> {
+                if (order > 0 && other.order == 0) {
+                    -1
+                } else if (order == 0 && other.order > 0) {
+                    1
+                } else if (order > 0 && other.order > 0) {
+                    order.compareTo(other.order)
+                } else {
+                    title.toLowerCase().compareTo(other.title.toLowerCase())
+                }
+            }
         }
 
         if (sorting and SORT_DESCENDING != 0) {