fix: crash when trying to get first topic in list (#407)

dixidroid · web-flow · commit b892560ab547 · 2024-11-18T14:05:06.000+02:00
diff --git a/discussion/src/main/java/org/openedx/discussion/presentation/threads/DiscussionAddThreadViewModel.kt b/discussion/src/main/java/org/openedx/discussion/presentation/threads/DiscussionAddThreadViewModel.kt
@@ -65,9 +65,8 @@ class DiscussionAddThreadViewModel(
     }
 
     fun getHandledTopicById(topicId: String): Pair<String, String> {
-        return getHandledTopics()
-            .find { it.second == topicId }
-            ?: getHandledTopics()[0]
+        val topics = getHandledTopics()
+        return topics.find { it.second == topicId } ?: topics.firstOrNull() ?: Pair("", "")
     }
 
     fun sendThreadAdded() {

Original file line number	Diff line number	Diff line change
`@@ -65,9 +65,8 @@ class DiscussionAddThreadViewModel(`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`fun getHandledTopicById(topicId: String): Pair<String, String> {`
`68`		`- return getHandledTopics()`
`69`		`- .find { it.second == topicId }`
`70`		`- ?: getHandledTopics()[0]`
	`68`	`+ val topics = getHandledTopics()`
	`69`	`+ return topics.find { it.second == topicId } ?: topics.firstOrNull() ?: Pair("", "")`
`71`	`70`	`}`
`72`	`71`
`73`	`72`	`fun sendThreadAdded() {`