third-party-mirrors/ultrasonic
1
0
Fork 0
mirror of https://gitlab.com/ultrasonic/ultrasonic.git synced 2025-04-25 05:10:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed Server Id and Indexing

Browse Source
This commit is contained in:
Nite 2020-09-24 18:20:59 +02:00
parent 59c0054a11
commit 5b0c9906f1
No known key found for this signature in database
GPG Key ID: 1D1AD59B1C6386C1
2 changed files with 38 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
ultrasonic/src/main/kotlin/org/moire/ultrasonic/activity/ServerSettingsModel.kt
View File

@ -85,7 +85,10 @@ class ServerSettingsModel(
*/
fun getServerList(): LiveData<List<ServerSetting>> {
viewModelScope.launch {
val dbServerList = repository.loadAllServerSettings().toMutableList()
var dbServerList = repository.loadAllServerSettings().toMutableList()
if (areIndexesMissing(dbServerList)) {
dbServerList = reindexSettings(dbServerList).toMutableList()
}
dbServerList.add(0, ServerSetting(context.getString(R.string.main_offline), ""))
serverList.value = dbServerList
@ -196,7 +199,7 @@ class ServerSettingsModel(
viewModelScope.launch {
serverSetting.index = (repository.count() ?: 0) + 1
serverSetting.id = serverSetting.index
serverSetting.id = (repository.getMaxId() ?: 0) + 1
repository.insert(serverSetting)
Log.d(TAG, "saveNewItem saved server setting: $serverSetting")
}
@ -231,4 +234,31 @@ class ServerSettingsModel(
settings.getString(PREFERENCES_KEY_MUSIC_FOLDER_ID + preferenceId, null)
)
}
/**
* Checks if there are any missing indexes in the ServerSetting list
* For displaying the Server Settings in a ListView, it is mandatory that their indexes
* are'nt missing. Ideally the indexes are continuous, but some circumstances (e.g.
* concurrency or migration errors) may get them out of order.
* This would make the List Adapter crash, so it is best to prepare and check the list.
*/
private fun areIndexesMissing(settings: List<ServerSetting>): Boolean {
for (i in 1 until settings.size + 1) {
if (!settings.any { s -> s.index == i }) return true
}
return false
}
/**
* This function updates all the Server Settings in the DB so their indexing is continuous.
*/
private suspend fun reindexSettings(settings: List<ServerSetting>): List<ServerSetting> {
val sortedSettings = settings.sortedBy { t -> t.index }
for (i in sortedSettings.indices) {
sortedSettings[i].index = i + 1
repository.update(sortedSettings[i])
Log.d(TAG, "reindexSettings saved ${sortedSettings[i]}")
}
return sortedSettings
}
}

6
ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/ServerSettingDao.kt
View File

@ -54,4 +54,10 @@ interface ServerSettingDao {
*/
@Query("SELECT COUNT(*) FROM serverSetting")
suspend fun count(): Int?
/**
* Retrieves the greatest value of the Id column in the table
*/
@Query("SELECT MAX([id]) FROM serverSetting")
suspend fun getMaxId(): Int?
}