From 98bd42f3ae5111d5cb1e7ad42eabf206255e0e2e Mon Sep 17 00:00:00 2001 From: Koitharu Date: Fri, 27 Oct 2023 14:55:12 +0300 Subject: [PATCH] Remove deletions from sync process --- app/build.gradle | 4 ++-- .../koitharu/kotatsu/favourites/data/FavouritesDao.kt | 1 + .../org/koitharu/kotatsu/sync/domain/SyncHelper.kt | 9 --------- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index e09bfd3c4..dcb994c5a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -16,8 +16,8 @@ android { applicationId 'org.koitharu.kotatsu' minSdk = 21 targetSdk = 34 - versionCode = 591 - versionName = '6.2.4' + versionCode = 592 + versionName = '6.2.5-a1' generatedDensities = [] testInstrumentationRunner "org.koitharu.kotatsu.HiltTestRunner" ksp { diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/favourites/data/FavouritesDao.kt b/app/src/main/kotlin/org/koitharu/kotatsu/favourites/data/FavouritesDao.kt index b9480a456..21b771b69 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/favourites/data/FavouritesDao.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/favourites/data/FavouritesDao.kt @@ -169,6 +169,7 @@ abstract class FavouritesDao { ListSortOrder.NEWEST -> "favourites.created_at DESC" ListSortOrder.ALPHABETIC -> "manga.title ASC" ListSortOrder.NEW_CHAPTERS -> "(SELECT chapters_new FROM tracks WHERE tracks.manga_id = manga.manga_id) DESC" + ListSortOrder.UPDATED, // for legacy support ListSortOrder.PROGRESS -> "(SELECT percent FROM history WHERE history.manga_id = manga.manga_id) DESC" else -> throw IllegalArgumentException("Sort order $sortOrder is not supported") } diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/sync/domain/SyncHelper.kt b/app/src/main/kotlin/org/koitharu/kotatsu/sync/domain/SyncHelper.kt index 4051ae822..803d5a2d6 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/sync/domain/SyncHelper.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/sync/domain/SyncHelper.kt @@ -130,9 +130,6 @@ class SyncHelper @AssistedInject constructor( private fun upsertHistory(json: JSONArray, timestamp: Long): Array { val uri = uri(authorityHistory, TABLE_HISTORY) val operations = ArrayList() - operations += ContentProviderOperation.newDelete(uri) - .withSelection("updated_at < ?", arrayOf(timestamp.toString())) - .build() json.mapJSONTo(operations) { jo -> operations.addAll(upsertManga(jo.removeJSONObject("manga"), authorityHistory)) ContentProviderOperation.newInsert(uri) @@ -145,9 +142,6 @@ class SyncHelper @AssistedInject constructor( private fun upsertFavouriteCategories(json: JSONArray, timestamp: Long): Array { val uri = uri(authorityFavourites, TABLE_FAVOURITE_CATEGORIES) val operations = ArrayList() - operations += ContentProviderOperation.newDelete(uri) - .withSelection("created_at < ?", arrayOf(timestamp.toString())) - .build() json.mapJSONTo(operations) { jo -> ContentProviderOperation.newInsert(uri) .withValues(jo.toContentValues()) @@ -159,9 +153,6 @@ class SyncHelper @AssistedInject constructor( private fun upsertFavourites(json: JSONArray, timestamp: Long): Array { val uri = uri(authorityFavourites, TABLE_FAVOURITES) val operations = ArrayList() - operations += ContentProviderOperation.newDelete(uri) - .withSelection("created_at < ?", arrayOf(timestamp.toString())) - .build() json.mapJSONTo(operations) { jo -> operations.addAll(upsertManga(jo.removeJSONObject("manga"), authorityFavourites)) ContentProviderOperation.newInsert(uri)