Fixed crash with empty Stop Token string

CosmicEventHorizon · Aug 11, 2023 · b0fadc8 · b0fadc8
1 parent 8db74a1
commit b0fadc8
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/app/src/main/java/com/pirouette/chibichat/MainActivity.kt b/app/src/main/java/com/pirouette/chibichat/MainActivity.kt
@@ -81,7 +81,9 @@ class MainActivity : AppCompatActivity() {
         subStringArray.clear()
         var tmp = ""
         stopToken = stopToken + ",";
-        subString = subString + ",";
+        if(subString != "") {
+            subString = subString + ",";
+        }
         for (charIndex in stopToken.indices) {
             if (stopToken[charIndex] == ',') {
                 stopTokenArray.add(tmp)
@@ -116,8 +118,10 @@ class MainActivity : AppCompatActivity() {
                 val jsonIndex = jsonResult.getJSONObject(0)
                 val jsonText = jsonIndex.get("text")
                 result = jsonText.toString()
-                for (item in subStringArray){
-                    result = result.substringBefore(item)
+                if (subStringArray.isNotEmpty() && subStringArray.size>0) {
+                    for (item in subStringArray) {
+                        result = result.substringBefore(item)
+                    }
                 }
                 addMessage(result)
                 promptsList = promptsList + result