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

openedx · Nov 18, 2024 · b892560 · b892560
1 parent c6b8fa5
commit b892560
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/...src/main/java/org/openedx/discussion/presentation/threads/DiscussionAddThreadViewModel.kt b/...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() {