fix: crash when trying to get first topic in list

openedx · Nov 14, 2024 · fcaf563 · fcaf563
1 parent 88dfc54
commit fcaf563
Showing 1 changed file with 3 additions and 4 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() {
@@ -76,4 +75,4 @@ class DiscussionAddThreadViewModel(
         }
     }
 
-}
+}