From f4de1bf0df06eceee1ecf3918033835553eeeac1 Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Thu, 11 Jan 2018 12:32:52 -0600
Subject: [PATCH] Bump backup format version

---
 .../main/java/com/todoroo/astrid/backup/TasksXmlExporter.java  | 3 +--
 .../main/java/com/todoroo/astrid/backup/TasksXmlImporter.java  | 3 ++-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/todoroo/astrid/backup/TasksXmlExporter.java b/app/src/main/java/com/todoroo/astrid/backup/TasksXmlExporter.java
index 84a0a2759..89cab5439 100755
--- a/app/src/main/java/com/todoroo/astrid/backup/TasksXmlExporter.java
+++ b/app/src/main/java/com/todoroo/astrid/backup/TasksXmlExporter.java
@@ -74,8 +74,7 @@ public class TasksXmlExporter {
     private UserActivityDao userActivityDao;
     private final Preferences preferences;
 
-    // 3 is started on Version 4.6.10
-    private static final int FORMAT = 3;
+    private static final int FORMAT = 4;
     private Context context;
     private int exportCount = 0;
     private XmlSerializer xml;
diff --git a/app/src/main/java/com/todoroo/astrid/backup/TasksXmlImporter.java b/app/src/main/java/com/todoroo/astrid/backup/TasksXmlImporter.java
index 0c48ae5bd..69cad5186 100755
--- a/app/src/main/java/com/todoroo/astrid/backup/TasksXmlImporter.java
+++ b/app/src/main/java/com/todoroo/astrid/backup/TasksXmlImporter.java
@@ -121,7 +121,7 @@ public class TasksXmlImporter {
                         String format = xpp.getAttributeValue(null, BackupConstants.ASTRID_ATTR_FORMAT);
                         if(TextUtils.equals(format, FORMAT2)) {
                             new Format2TaskImporter(xpp);
-                        } else if(TextUtils.equals(format, FORMAT3)) {
+                        } else if(TextUtils.equals(format, FORMAT3) || TextUtils.equals(format, FORMAT4)) {
                             new Format3TaskImporter(xpp);
                         } else {
                             throw new UnsupportedOperationException(
@@ -376,6 +376,7 @@ public class TasksXmlImporter {
     // =============================================================== FORMAT3
 
     private static final String FORMAT3 = "3"; //$NON-NLS-1$
+    private static final String FORMAT4 = "4"; //$NON-NLS-1$
     private class Format3TaskImporter extends Format2TaskImporter {
 
         public Format3TaskImporter(XmlPullParser xpp) throws XmlPullParserException, IOException {