From aea249ad96da1973e486317f455ed259d03d1320 Mon Sep 17 00:00:00 2001 From: Cuong-Tran Date: Wed, 6 Nov 2024 20:48:41 +0700 Subject: [PATCH] remove preview-to-stable update --- .../interactor/GetApplicationRelease.kt | 10 --- .../interactor/GetApplicationReleaseTest.kt | 90 ------------------- 2 files changed, 100 deletions(-) diff --git a/domain/src/main/java/tachiyomi/domain/release/interactor/GetApplicationRelease.kt b/domain/src/main/java/tachiyomi/domain/release/interactor/GetApplicationRelease.kt index 07030c287..e12eb1187 100644 --- a/domain/src/main/java/tachiyomi/domain/release/interactor/GetApplicationRelease.kt +++ b/domain/src/main/java/tachiyomi/domain/release/interactor/GetApplicationRelease.kt @@ -94,11 +94,6 @@ class GetApplicationRelease( return if (isPreview) { // Preview builds: based on releases in "komikku-app/komikku-preview" repo // tagged as something like "r1234" - // KMK --> - // When has stable update but current app is preview version (same repo) expect new update - // TODO: remove this when all users has finished switching from preview to stable - if (newVersion.matches("""\d.\d.\d""".toRegex())) return true - // KMK <-- newVersion.toInt() > commitCount } else { // Release builds: based on releases in "komikku-app/komikku" repo @@ -108,11 +103,6 @@ class GetApplicationRelease( val newSemVer = newVersion.split(".").map { it.toInt() } val oldSemVer = oldVersion.split(".").map { it.toInt() } - // KMK --> - // When has stable update with preview version but current app is stable version expect no update - // TODO: remove this when all users has finished switching from preview to stable - if (newSemVer.size != oldSemVer.size) return false - // KMK <-- oldSemVer.mapIndexed { index, i -> if (newSemVer[index] > i) { return true diff --git a/domain/src/test/java/tachiyomi/domain/release/interactor/GetApplicationReleaseTest.kt b/domain/src/test/java/tachiyomi/domain/release/interactor/GetApplicationReleaseTest.kt index e23e3884b..268835bca 100644 --- a/domain/src/test/java/tachiyomi/domain/release/interactor/GetApplicationReleaseTest.kt +++ b/domain/src/test/java/tachiyomi/domain/release/interactor/GetApplicationReleaseTest.kt @@ -179,94 +179,4 @@ class GetApplicationReleaseTest { coVerify(exactly = 0) { releaseService.releaseNotes(any()) } result shouldBe GetApplicationRelease.Result.NoNewUpdate } - - // KMK --> - // TODO: remove below tests when all users finished switching from preview to stable - @Test - fun `When preview version updating to new stable version with preview tag expect new update`() = runTest { - every { preference.get() } returns 0 - every { preference.set(any()) }.answers { } - - val releases = listOf( - Release( - "r1234", - "info", - "http://example.com/release_link", - listOf("http://example.com/assets"), - ), - ) - - coEvery { releaseService.releaseNotes(any()) } returns releases - - val result = getApplicationRelease.await( - GetApplicationRelease.Arguments( - isPreview = true, - isThirdParty = false, - commitCount = 25, - versionName = "", - repository = "test", - ), - ) - - result shouldBe GetApplicationRelease.Result.NewUpdate(releases.getLatest()!!) - } - - @Test - fun `When has stable update with preview version but current app is stable version expect no update`() = runTest { - every { preference.get() } returns 0 - every { preference.set(any()) }.answers { } - - val releases = listOf( - Release( - "r1234", - "info", - "http://example.com/release_link", - listOf("http://example.com/assets"), - ), - ) - - coEvery { releaseService.releaseNotes(any()) } returns releases - - val result = getApplicationRelease.await( - GetApplicationRelease.Arguments( - isPreview = false, - isThirdParty = false, - commitCount = 0, - versionName = "v1.0.0", - repository = "test", - ), - ) - - result shouldBe GetApplicationRelease.Result.NoNewUpdate - } - - @Test - fun `When has stable update but current app is preview version (same repo) expect new update`() = runTest { - every { preference.get() } returns 0 - every { preference.set(any()) }.answers { } - - val releases = listOf( - Release( - "v2.0.0", - "info", - "http://example.com/release_link", - listOf("http://example.com/assets"), - ), - ) - - coEvery { releaseService.releaseNotes(any()) } returns releases - - val result = getApplicationRelease.await( - GetApplicationRelease.Arguments( - isPreview = true, - isThirdParty = false, - commitCount = 25, - versionName = "", - repository = "test", - ), - ) - - result shouldBe GetApplicationRelease.Result.NewUpdate(releases.getLatest()!!) - } - // KMK <-- }