Merge pull request EventFahrplan#603 from EventFahrplan/shift-title-e…

…mpty Display session subtitle as title if the latter is empty.
johnjohndoe · Jan 10, 2024 · 5903404 · 5903404
2 parents c7d8c92 + d43a200
commit 5903404
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/app/src/main/java/nerd/tuxmobil/fahrplan/congress/dataconverters/SessionExtensions.kt b/app/src/main/java/nerd/tuxmobil/fahrplan/congress/dataconverters/SessionExtensions.kt
@@ -164,6 +164,10 @@ fun SessionNetworkModel.toSessionAppModel(): Session {
 }
 
 fun Session.sanitize(): Session {
+    if (title.isEmpty() && subtitle.isNotEmpty()) {
+        title = subtitle
+        subtitle = ""
+    }
     if (title == subtitle) {
         subtitle = ""
     }

diff --git a/app/src/test/java/nerd/tuxmobil/fahrplan/congress/dataconverters/SessionExtensionsTest.kt b/app/src/test/java/nerd/tuxmobil/fahrplan/congress/dataconverters/SessionExtensionsTest.kt
@@ -196,6 +196,19 @@ class SessionExtensionsTest {
         assertThat(session.toHighlightDatabaseModel()).isEqualTo(highlight)
     }
 
+    @Test
+    fun sanitizeWithEmptyTitleAndSubtitle() {
+        val session = Session("").apply {
+            subtitle = "Lorem ipsum"
+            title = ""
+        }.sanitize()
+        val expected = Session("").apply {
+            subtitle = ""
+            title = "Lorem ipsum"
+        }
+        assertThat(session).isEqualTo(expected)
+    }
+
     @Test
     fun sanitizeWithSameTitleAndSubtitle() {
         val session = Session("").apply {
@@ -271,10 +284,12 @@ class SessionExtensionsTest {
         val session = Session("").apply {
             speakers = listOf("Luke Skywalker")
             subtitle = "Luke Skywalker"
+            title = "Some title"
         }.sanitize()
         val expected = Session("").apply {
             speakers = listOf("Luke Skywalker")
             subtitle = ""
+            title = "Some title"
         }
         assertThat(session).isEqualTo(expected)
     }
@@ -284,10 +299,12 @@ class SessionExtensionsTest {
         val session = Session("").apply {
             speakers = listOf("Darth Vader")
             subtitle = "Lorem ipsum"
+            title = "Some title"
         }.sanitize()
         val expected = Session("").apply {
             speakers = listOf("Darth Vader")
             subtitle = "Lorem ipsum"
+            title = "Some title"
         }
         assertThat(session).isEqualTo(expected)
     }