diff --git a/app/src/main/java/org/tasks/backup/BackupContainer.java b/app/src/main/java/org/tasks/backup/BackupContainer.java index c2055c392..c077293fa 100644 --- a/app/src/main/java/org/tasks/backup/BackupContainer.java +++ b/app/src/main/java/org/tasks/backup/BackupContainer.java @@ -20,10 +20,10 @@ import org.tasks.data.UserActivity; class BackupContainer { - final List tasks; - final List tags; - final List filters; - final List googleTaskLists; + private final List tasks; + private final List tags; + private final List filters; + private final List googleTaskLists; private final List googleTaskAccounts; private final List caldavAccounts; private final List caldavCalendars; @@ -45,6 +45,22 @@ class BackupContainer { this.caldavCalendars = caldavCalendars; } + public List getTasks() { + return tasks == null ? emptyList() : tasks; + } + + public List getTags() { + return tags == null ? emptyList() : tags; + } + + public List getFilters() { + return filters == null ? emptyList() : filters; + } + + public List getGoogleTaskLists() { + return googleTaskLists == null ? emptyList() : googleTaskLists; + } + public List getCaldavAccounts() { return caldavAccounts == null ? emptyList() : caldavAccounts; } diff --git a/app/src/main/java/org/tasks/backup/TasksJsonImporter.java b/app/src/main/java/org/tasks/backup/TasksJsonImporter.java index 30bc4c9c1..1c0555087 100644 --- a/app/src/main/java/org/tasks/backup/TasksJsonImporter.java +++ b/app/src/main/java/org/tasks/backup/TasksJsonImporter.java @@ -128,7 +128,7 @@ public class TasksJsonImporter { try { JsonElement data = input.get("data"); BackupContainer backupContainer = gson.fromJson(data, BackupContainer.class); - for (TagData tagData : backupContainer.tags) { + for (TagData tagData : backupContainer.getTags()) { if (tagDataDao.getByUuid(tagData.getRemoteId()) == null) { tagDataDao.createNew(tagData); } @@ -138,12 +138,12 @@ public class TasksJsonImporter { googleTaskListDao.insert(googleTaskAccount); } } - for (GoogleTaskList googleTaskList : backupContainer.googleTaskLists) { + for (GoogleTaskList googleTaskList : backupContainer.getGoogleTaskLists()) { if (googleTaskListDao.getByRemoteId(googleTaskList.getRemoteId()) == null) { googleTaskListDao.insert(googleTaskList); } } - for (Filter filter : backupContainer.filters) { + for (Filter filter : backupContainer.getFilters()) { if (filterDao.getByName(filter.getTitle()) == null) { filterDao.insert(filter); } @@ -158,7 +158,7 @@ public class TasksJsonImporter { caldavDao.insert(calendar); } } - for (BackupContainer.TaskBackup backup : backupContainer.tasks) { + for (BackupContainer.TaskBackup backup : backupContainer.getTasks()) { taskCount++; setProgressMessage(activity.getString(R.string.import_progress_read, taskCount)); Task task = backup.task;