From dc45e0f5dfb51d4f6ff97335dd98f9f28d18b444 Mon Sep 17 00:00:00 2001 From: Koitharu Date: Mon, 27 May 2024 17:29:31 +0300 Subject: [PATCH] Revert "Update sources catalog ui" This reverts commit 597ad01e8fd2e7bd2736296e37f6e46299b99981. --- .../kotatsu/core/db/migrations/Migration20To21.kt | 12 ------------ .../org/koitharu/kotatsu/tracker/data/TrackEntity.kt | 2 -- .../kotatsu/tracker/domain/TrackingRepository.kt | 3 --- 3 files changed, 17 deletions(-) delete mode 100644 app/src/main/kotlin/org/koitharu/kotatsu/core/db/migrations/Migration20To21.kt diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/db/migrations/Migration20To21.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/db/migrations/Migration20To21.kt deleted file mode 100644 index 462b77261..000000000 --- a/app/src/main/kotlin/org/koitharu/kotatsu/core/db/migrations/Migration20To21.kt +++ /dev/null @@ -1,12 +0,0 @@ -package org.koitharu.kotatsu.core.db.migrations - -import androidx.room.migration.Migration -import androidx.sqlite.db.SupportSQLiteDatabase - -class Migration20To21 : Migration(20, 21) { - - override fun migrate(db: SupportSQLiteDatabase) { - db.execSQL("ALTER TABLE tracks ADD COLUMN `last_error` TEXT DEFAULT NULL") - db.execSQL("ALTER TABLE sources ADD COLUMN `added_in` INTEGER NOT NULL DEFAULT 0") - } -} diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/tracker/data/TrackEntity.kt b/app/src/main/kotlin/org/koitharu/kotatsu/tracker/data/TrackEntity.kt index 127a60b4c..c152253ac 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/tracker/data/TrackEntity.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/tracker/data/TrackEntity.kt @@ -25,7 +25,6 @@ class TrackEntity( @ColumnInfo(name = "last_check_time") val lastCheckTime: Long, @ColumnInfo(name = "last_chapter_date") val lastChapterDate: Long, @ColumnInfo(name = "last_result") val lastResult: Int, - @ColumnInfo(name = "last_error") val lastError: String?, ) { companion object { @@ -43,7 +42,6 @@ class TrackEntity( lastCheckTime = 0L, lastChapterDate = 0, lastResult = RESULT_NONE, - lastError = null, ) } } diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/tracker/domain/TrackingRepository.kt b/app/src/main/kotlin/org/koitharu/kotatsu/tracker/domain/TrackingRepository.kt index 58bd10e95..e4f60dee0 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/tracker/domain/TrackingRepository.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/tracker/domain/TrackingRepository.kt @@ -168,7 +168,6 @@ class TrackingRepository @Inject constructor( lastCheckTime = tracking.lastCheck?.toEpochMilli() ?: 0L, lastChapterDate = tracking.lastChapterDate?.toEpochMilli() ?: 0L, lastResult = TrackEntity.RESULT_EXTERNAL_MODIFICATION, - lastError = null, ) db.getTracksDao().upsert(entity) } @@ -225,7 +224,6 @@ class TrackingRepository @Inject constructor( lastCheckTime = System.currentTimeMillis(), lastChapterDate = lastChapterDate, lastResult = TrackEntity.RESULT_FAILED, - lastError = updates.error?.toString(), ) is MangaUpdates.Success -> TrackEntity( @@ -235,7 +233,6 @@ class TrackingRepository @Inject constructor( lastCheckTime = System.currentTimeMillis(), lastChapterDate = updates.lastChapterDate().ifZero { lastChapterDate }, lastResult = if (updates.isNotEmpty()) TrackEntity.RESULT_HAS_UPDATE else TrackEntity.RESULT_NO_UPDATE, - lastError = null, ) } }