GiftedHacker/tangem-app-android-audited
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Updated on 2026-08-14

Browse source
This commit is contained in:
Tangem 2025-12-05 13:08:57 +02:00
parent 16b8957165
commit 972a287b1d
3 changed files with 8 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

9
core/config-toggles/src/main/kotlin/com/tangem/core/configtoggle/version/Version.kt
View file

@ -33,12 +33,9 @@ internal class Version private constructor(value: String) : Comparable<Version>
var result = major.compareTo(other.major) var result = major.compareTo(other.major)
if (result == 0) result = minor.compareTo(other.minor) if (result == 0) result = minor.compareTo(other.minor)
if (result == 0) { if (result == 0) {
when { val thisFix = fix ?: 0
fix == null && other.fix == null -> result = 0 val otherFix = other.fix ?: 0
fix == null && other.fix != null -> result = -1 result = thisFix.compareTo(otherFix)
fix != null && other.fix == null -> result = 1
fix != null && other.fix != null -> result = fix.compareTo(other.fix)
}
} }
return result return result
} }

4
core/config-toggles/src/test/kotlin/com/tangem/core/configtoggle/contract/VersionTest.kt
View file

@ -101,7 +101,7 @@ internal class VersionTest {
val actual = one?.compareTo(other) val actual = one?.compareTo(other)
Truth.assertThat(actual).isEqualTo(ONE_IS_LESS_THAN_OTHER) Truth.assertThat(actual).isEqualTo(ONE_IS_EQUAL_TO_OTHER)
} }
@Test @Test
@ -111,7 +111,7 @@ internal class VersionTest {
val actual = one?.compareTo(other) val actual = one?.compareTo(other)
Truth.assertThat(actual).isEqualTo(ONE_IS_GREATER_THAN_OTHER) Truth.assertThat(actual).isEqualTo(ONE_IS_EQUAL_TO_OTHER)
} }
private companion object { private companion object {

6
plugins/configuration/src/main/kotlin/com/tangem/plugin/configuration/utils/VersionNameProvider.kt
View file

@ -86,9 +86,9 @@ internal class VersionNameProvider(
val major = matchResult.groupValues[1] val major = matchResult.groupValues[1]
val minor = matchResult.groupValues[2] val minor = matchResult.groupValues[2]
val patch = matchResult.groupValues[3].ifEmpty { "0" } val patch = matchResult.groupValues[3]
return "$major.$minor.$patch" return if (patch.isEmpty()) "$major.$minor" else "$major.$minor.$patch"
} }
private fun incrementMinorVersion(version: String): String { private fun incrementMinorVersion(version: String): String {
@ -99,7 +99,7 @@ internal class VersionNameProvider(
val minor = parts[1].toIntOrNull() ?: return version val minor = parts[1].toIntOrNull() ?: return version
val newMinor = minor + 1 val newMinor = minor + 1
return "$major.$newMinor.0" return "$major.$newMinor"
} }
} }