Order host sources by name (so that the sources first in the list contain the least duplicates)

app/src/main/java/com/frostnerd/smokescreen/database/dao/HostSourceDao.kt

@@ -48,7 +48,7 @@ interface HostSourceDao {
     @Query("SELECT * FROM HostSource ORDER BY name COLLATE NOCASE ASC")
     fun getAll(): List<HostSource>
 
-    @Query("SELECT * FROM HostSource WHERE enabled > 0 ORDER BY whitelistSource DESC")
+    @Query("SELECT * FROM HostSource WHERE enabled > 0 ORDER BY name ASC")
     fun getAllEnabled(): List<HostSource>
 
     @Query("SELECT COUNT(*) FROM HostSource")

app/src/main/java/com/frostnerd/smokescreen/service/RuleImportService.kt

@@ -97,9 +97,7 @@ class RuleImportService : IntentService("RuleImportService") {
             getDatabase().hostSourceDao().getAllEnabled().filter {
                 it.id in ids
             }
-        } ?: getDatabase().hostSourceDao().getAllEnabled()).sortedByDescending {
-            it.whitelistSource // Process whitelist first
-        }
+        } ?: getDatabase().hostSourceDao().getAllEnabled()).sortedWith(compareBy({it.whitelistSource}, {it.name}))
         sourcesIds = sources.map { it.id }
         startWork()
     }