diff --git a/app/src/main/java/com/droiddeck/launcher/update/AppUpdates.kt b/app/src/main/java/com/droiddeck/launcher/update/AppUpdates.kt index 222d308590..00f60c5af4 100644 --- a/app/src/main/java/com/droiddeck/launcher/update/AppUpdates.kt +++ b/app/src/main/java/com/droiddeck/launcher/update/AppUpdates.kt @@ -202,16 +202,27 @@ object AppUpdates { fun follow(context: Context, catalog: Catalog?): Follow { stored(context)?.let { return it } - val me = installed() - val inferred = when { - me.pr != 0 -> Follow(Channel.TEST, me.pr) - catalog == null -> return Follow(Channel.STABLE) - catalog.stable != null && isRunning(catalog.stable, me) -> Follow(Channel.STABLE) - me.updatable -> Follow(Channel.NIGHTLY) - else -> Follow(Channel.STABLE) - } - setFollow(context, inferred) - return inferred + val guess = guessFollow(catalog, installed()) + if (guess.certain) setFollow(context, guess.follow) + return guess.follow + } + + internal class Guess(val follow: Follow, val certain: Boolean) + + /** + * Stable and Preview builds of one commit are the same APK, so only the catalog can tell them apart. A guess that + * the catalog does not prove (a stale cache, the gap before a release is catalogued) is used for this run only. + */ + internal fun guessFollow(catalog: Catalog?, me: Installed): Guess { + if (me.pr != 0) return Guess(Follow(Channel.TEST, me.pr), true) + val stable = catalog?.stable + if (stable != null && isRunning(stable, me)) return Guess(Follow(Channel.STABLE), true) + if (stable?.version?.let { compareVersions(me.version, it) < 0 } == true) return Guess(Follow(Channel.STABLE), true) + val publishedPreview = catalog != null && me.updatable && ( + catalog.preview?.let { isRunning(it, me) } == true || + catalog.recentPreviews.any { matchesInstalledCommit(it.commit, me.commit) } + ) + return Guess(Follow(if (publishedPreview) Channel.NIGHTLY else Channel.STABLE), false) } fun setFollow(context: Context, follow: Follow) { diff --git a/app/src/test/java/com/droiddeck/launcher/update/AppUpdatesTest.kt b/app/src/test/java/com/droiddeck/launcher/update/AppUpdatesTest.kt index ada2ff3bef..a2d07adbd9 100644 --- a/app/src/test/java/com/droiddeck/launcher/update/AppUpdatesTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/update/AppUpdatesTest.kt @@ -8,6 +8,7 @@ import com.droiddeck.launcher.update.AppUpdates.Offer import com.droiddeck.launcher.update.AppUpdates.PreviewChange import com.droiddeck.launcher.update.AppUpdates.PreviewHistoryKind import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse import org.junit.Assert.assertNotNull import org.junit.Assert.assertNull import org.json.JSONArray @@ -285,4 +286,38 @@ class AppUpdatesTest { } catch (_: IOException) { } } + + @Test fun anOlderStableIsGuessedStableAndSaved() { + val g = AppUpdates.guessFollow(catalog, me("eeeeeee999", version = "0.1.9")) + assertEquals(AppUpdates.Channel.STABLE, g.follow.channel) + assertTrue(g.certain) + } + + @Test fun runningTheCatalogStableIsCertainStable() { + val g = AppUpdates.guessFollow(catalog, me(stable.commit)) + assertEquals(AppUpdates.Channel.STABLE, g.follow.channel) + assertTrue(g.certain) + } + + @Test fun aPublishedPreviewPastStableIsNightlyButNotSaved() { + val withHistory = AppUpdates.Catalog(stable, release("1111111"), emptyList(), 0L, recentPreview) + val g = AppUpdates.guessFollow(withHistory, me("2".repeat(40), version = "0.3.0")) + assertEquals(AppUpdates.Channel.NIGHTLY, g.follow.channel) + assertFalse(g.certain) + } + + @Test fun anUncataloguedNewerBuildStaysStableForNow() { + val g = AppUpdates.guessFollow(catalog, me("9".repeat(40), version = "0.3.0")) + assertEquals(AppUpdates.Channel.STABLE, g.follow.channel) + assertFalse(g.certain) + val offline = AppUpdates.guessFollow(null, me("9".repeat(40), version = "0.3.0")) + assertEquals(AppUpdates.Channel.STABLE, offline.follow.channel) + assertFalse(offline.certain) + } + + @Test fun aPullRequestBuildIsCertainTest() { + val g = AppUpdates.guessFollow(catalog, me("ccccccc2222222222222222222222222222222", pr = 93)) + assertEquals(AppUpdates.Channel.TEST, g.follow.channel) + assertTrue(g.certain) + } }