From c9af39b6ba1a25369c882e09c7abf6ef58e87836 Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Thu, 30 May 2024 13:23:33 -0500
Subject: [PATCH 1/2] Fix import backup crashes

---
 .../java/org/tasks/backup/BackupContainer.kt  | 44 +++++++++----------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/app/src/main/java/org/tasks/backup/BackupContainer.kt b/app/src/main/java/org/tasks/backup/BackupContainer.kt
index 3f0cc42c8..94de0c4df 100644
--- a/app/src/main/java/org/tasks/backup/BackupContainer.kt
+++ b/app/src/main/java/org/tasks/backup/BackupContainer.kt
@@ -23,32 +23,32 @@ import org.tasks.data.entity.UserActivity
 @Suppress("PLATFORM_CLASS_MAPPED_TO_KOTLIN")
 @Serializable
 class BackupContainer(
-    val tasks: List<TaskBackup>?,
-    val places: List<Place>?,
-    val tags: List<TagData>?,
-    val filters: List<Filter>?,
-    val caldavAccounts: List<CaldavAccount>?,
-    val caldavCalendars: List<CaldavCalendar>?,
-    val taskListMetadata: List<TaskListMetadata>?,
-    val taskAttachments: List<TaskAttachment>?,
-    val intPrefs: Map<String, Integer>?,
-    val longPrefs: Map<String, java.lang.Long>?,
-    val stringPrefs: Map<String, String>?,
-    val boolPrefs: Map<String, java.lang.Boolean>?,
-    val setPrefs: Map<String, java.util.Set<String>>?,
-    val googleTaskAccounts: List<GoogleTaskAccount>? = emptyList(),
-    val googleTaskLists: List<GoogleTaskList>? = emptyList(),
+    val tasks: List<TaskBackup>? = null,
+    val places: List<Place>? = null,
+    val tags: List<TagData>? = null,
+    val filters: List<Filter>? = null,
+    val caldavAccounts: List<CaldavAccount>? = null,
+    val caldavCalendars: List<CaldavCalendar>? = null,
+    val taskListMetadata: List<TaskListMetadata>? = null,
+    val taskAttachments: List<TaskAttachment>? = null,
+    val intPrefs: Map<String, Integer>? = null,
+    val longPrefs: Map<String, java.lang.Long>? = null,
+    val stringPrefs: Map<String, String>? = null,
+    val boolPrefs: Map<String, java.lang.Boolean>? = null,
+    val setPrefs: Map<String, java.util.Set<String>>? = null,
+    val googleTaskAccounts: List<GoogleTaskAccount>? = null,
+    val googleTaskLists: List<GoogleTaskList>? = null,
 ) {
     @Serializable
     class TaskBackup(
         val task: Task,
-        val alarms: List<Alarm>?,
-        val geofences: List<Geofence>?,
-        val tags: List<Tag>?,
-        val comments: List<UserActivity>?,
-        val attachments: List<Attachment>?,
-        val caldavTasks: List<CaldavTask>?,
-        val vtodo: String?,
+        val alarms: List<Alarm>? = null,
+        val geofences: List<Geofence>? = null,
+        val tags: List<Tag>? = null,
+        val comments: List<UserActivity>? = null,
+        val attachments: List<Attachment>? = null,
+        val caldavTasks: List<CaldavTask>? = null,
+        val vtodo: String? = null,
         val google: List<GoogleTask>? = null,
         val locations: List<LegacyLocation>? = null,
     )

From 1d8d2efce6b5f4a9466517249bfdce88bd2abb7f Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Thu, 30 May 2024 13:24:40 -0500
Subject: [PATCH 2/2] Update version and changelog

---
 CHANGELOG.md                                                  | 2 +-
 app/build.gradle.kts                                          | 4 ++--
 .../android/en-US/changelogs/{130908.txt => 130909.txt}       | 0
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename fastlane/metadata/android/en-US/changelogs/{130908.txt => 130909.txt} (100%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4ffedf894..a2b1ff9a8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-### 13.9.8 (2024-05-30)
+### 13.9.9 (2024-05-30)
 
 * Fix import backup crashes
 * Fix showing completed subtasks in edit screen
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index f8f8e4d49..35c9edff0 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -56,8 +56,8 @@ android {
     defaultConfig {
         testApplicationId = "org.tasks.test"
         applicationId = "org.tasks"
-        versionCode = 130908
-        versionName = "13.9.8"
+        versionCode = 130909
+        versionName = "13.9.9"
         targetSdk = 33
         minSdk = 24
         testInstrumentationRunner = "org.tasks.TestRunner"
diff --git a/fastlane/metadata/android/en-US/changelogs/130908.txt b/fastlane/metadata/android/en-US/changelogs/130909.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/130908.txt
rename to fastlane/metadata/android/en-US/changelogs/130909.txt