Fixed a null pointer exception that could get thrown in the subtasks metadata migration when bad data was in the database

13 years ago · df9f6d515b
parent d24b71c5aa
commit df9f6d515b
1 changed files with 5 additions and 2 deletions
--- a/astrid/plugin-src/com/todoroo/astrid/subtasks/SubtasksMetadataMigration.java
+++ b/astrid/plugin-src/com/todoroo/astrid/subtasks/SubtasksMetadataMigration.java
@ -101,8 +101,11 @@ public class SubtasksMetadataMigration {
                break;

            int indent = 0;
-            if (item.containsNonNullValue(SubtasksMetadata.INDENT))
-                indent = item.getValue(SubtasksMetadata.INDENT);
+            if (item.containsNonNullValue(SubtasksMetadata.INDENT)) {
+                Integer i = item.getValue(SubtasksMetadata.INDENT);
+                if (i != null)
+                    indent = i.intValue();
+            }
            Node parent = findNextParentForIndent(root, indent);
            Node newNode = new Node(item.getValue(Metadata.TASK), parent, parent.indent + 1);
            parent.children.add(newNode);