Fix updateNoteFields ArrayIndexOutOfBoundsException (#65)

KamWithK · Jul 13, 2024 · a075592 · a075592
1 parent a374ed6
commit a075592
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/app/src/main/java/com/kamwithk/ankiconnectandroid/ankidroid_api/IntegratedAPI.java b/app/src/main/java/com/kamwithk/ankiconnectandroid/ankidroid_api/IntegratedAPI.java
@@ -349,8 +349,12 @@ public void updateNoteFields(long note_id, Map<String, String> newFields, ArrayL
             if (newValue != null) {
                 // Update field to new value
                 cardFields.put(fieldName, newValue);
-            } else {
+                // Ankidroids `getFields` won't return empty fields that are at the end of the array
+                // so `originalFields` may potentially contain less fields than `modelFieldNames`
+            } else if (originalFields.length >= i + 1) {
                 cardFields.put(fieldName, originalFields[i]);
+            } else {
+                cardFields.put(fieldName, "");
             }
         }