diff options
| author | David Göransson <david.goransson@mullvad.net> | 2024-09-20 11:38:47 +0200 |
|---|---|---|
| committer | David Göransson <david.goransson@mullvad.net> | 2024-09-20 11:38:47 +0200 |
| commit | c268dda9a955c4e3854eace53b45848776f36f29 (patch) | |
| tree | 952ac92bb5979c41617db449987fa64abb08197c | |
| parent | c71fd5a5b9869c4050e1d9a12522e780e7212a34 (diff) | |
| parent | d88431cc223d8e906ede6a4c1e9c0a717931bb27 (diff) | |
| download | mullvadvpn-c268dda9a955c4e3854eace53b45848776f36f29.tar.xz mullvadvpn-c268dda9a955c4e3854eace53b45848776f36f29.zip | |
Merge branch 'fix-changelog-hypens-droid-1352'
| -rw-r--r-- | android/app/src/main/kotlin/net/mullvad/mullvadvpn/repository/ChangelogRepository.kt | 9 | ||||
| -rw-r--r-- | android/app/src/test/kotlin/net/mullvad/mullvadvpn/repository/ChangelogRepositoryTest.kt | 6 |
2 files changed, 7 insertions, 8 deletions
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/repository/ChangelogRepository.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/repository/ChangelogRepository.kt index 768423e01a..fcc07693c8 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/repository/ChangelogRepository.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/repository/ChangelogRepository.kt @@ -6,7 +6,6 @@ import net.mullvad.mullvadvpn.util.trimAll private const val MISSING_VERSION_CODE = -1 private const val NEWLINE_CHAR = '\n' -private const val SPACE_STRING = " " private const val BULLET_POINT_CHAR = '-' private const val LAST_SHOWED_CHANGELOG_VERSION_CODE = "last_showed_changelog_version_code" @@ -22,9 +21,9 @@ class ChangelogRepository( preferences.edit().putInt(LAST_SHOWED_CHANGELOG_VERSION_CODE, versionCode).apply() fun getLastVersionChanges(): List<String> = - dataProvider - .getChangelog() - .split(BULLET_POINT_CHAR) - .map { it.split(NEWLINE_CHAR).trimAll().joinToString(SPACE_STRING).trim() } + // Prepend with a new line char so each entry consists of NEWLINE_CHAR + BULLET_POINT_CHAR + (NEWLINE_CHAR + dataProvider.getChangelog()) + .split(NEWLINE_CHAR.toString() + BULLET_POINT_CHAR) + .trimAll() .filter { it.isNotEmpty() } } diff --git a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/repository/ChangelogRepositoryTest.kt b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/repository/ChangelogRepositoryTest.kt index 4929c7117b..e38d6bebbc 100644 --- a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/repository/ChangelogRepositoryTest.kt +++ b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/repository/ChangelogRepositoryTest.kt @@ -19,12 +19,12 @@ class ChangelogRepositoryTest { fun `when given a changelog text should return a list of correctly formatted strings`() { // Arrange val testChangelog = - "- Added very nice new feature with a very long descriptive message\n" + - " about how it works...\n" + + "- Added very nice new feature with a very long descriptive message-with-hyphens\n" + + " - about how it works...\n" + "- Fixed super bad leak." val expectedResult = listOf( - "Added very nice new feature with a very long descriptive message about how it works...", + "Added very nice new feature with a very long descriptive message-with-hyphens\n - about how it works...", "Fixed super bad leak.", ) every { mockDataProvider.getChangelog() } returns testChangelog |