From ce57cbfdea64a9c68259ab9b62641ad5930ff982 Mon Sep 17 00:00:00 2001
From: ggurdin <46800240+ggurdin@users.noreply.github.com>
Date: Wed, 22 Jan 2025 16:00:49 -0500
Subject: [PATCH] fix: if lemma not in choices list, add instead of replace
 (#1538)

---
 lib/pangea/toolbar/repo/lemma_activity_generator.dart | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/pangea/toolbar/repo/lemma_activity_generator.dart b/lib/pangea/toolbar/repo/lemma_activity_generator.dart
index 8c3adf8df..6773a1a44 100644
--- a/lib/pangea/toolbar/repo/lemma_activity_generator.dart
+++ b/lib/pangea/toolbar/repo/lemma_activity_generator.dart
@@ -1,5 +1,4 @@
 import 'dart:developer';
-import 'dart:math';
 
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
@@ -62,9 +61,13 @@ class LemmaActivityGenerator {
 
     // Take the shortest 4
     final choices = sortedLemmas.take(4).toList();
+    if (choices.isEmpty) {
+      return [token.lemma.text];
+    }
+
     if (!choices.contains(token.lemma.text)) {
-      final random = Random();
-      choices[random.nextInt(choices.length - 1)] = token.lemma.text;
+      choices.add(token.lemma.text);
+      choices.shuffle();
     }
     return choices;
   }