From e641d71e35e7fa92c9655f78096999912c46f5ee Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Thu, 18 Jun 2020 16:27:26 -0500
Subject: [PATCH] Mark caldav list and account ids as transient

---
 CHANGELOG.md                                         | 4 ++++
 app/build.gradle.kts                                 | 4 ++--
 app/src/main/java/org/tasks/data/CaldavAccount.kt    | 1 +
 app/src/main/java/org/tasks/data/CaldavCalendar.kt   | 1 +
 app/src/main/res/values/changelog.xml                | 1 +
 fastlane/metadata/android/en-US/changelogs/90701.txt | 1 +
 6 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100644 fastlane/metadata/android/en-US/changelogs/90701.txt

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3905816d6..12a0cb13a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,10 @@
 Change Log
 ---
 =======
+### 9.7.1 (2020-06-18)
+
+* Fix crash on backup import
+
 ### 9.7 (2020-06-12)
 
 * Added '☰ > Manage lists'
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index ab8387569..05f9d8120 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -43,8 +43,8 @@ android {
     defaultConfig {
         testApplicationId = "org.tasks.test"
         applicationId = "org.tasks"
-        versionCode = 90700
-        versionName = "9.7"
+        versionCode = 90701
+        versionName = "9.7.1"
         targetSdkVersion(Versions.targetSdk)
         minSdkVersion(Versions.minSdk)
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
diff --git a/app/src/main/java/org/tasks/data/CaldavAccount.kt b/app/src/main/java/org/tasks/data/CaldavAccount.kt
index 663d91292..32c935d31 100644
--- a/app/src/main/java/org/tasks/data/CaldavAccount.kt
+++ b/app/src/main/java/org/tasks/data/CaldavAccount.kt
@@ -18,6 +18,7 @@ import org.tasks.security.KeyStoreEncryption
 class CaldavAccount : Parcelable {
     @PrimaryKey(autoGenerate = true)
     @ColumnInfo(name = "cda_id")
+    @Transient
     var id: Long = 0
 
     @ColumnInfo(name = "cda_uuid")
diff --git a/app/src/main/java/org/tasks/data/CaldavCalendar.kt b/app/src/main/java/org/tasks/data/CaldavCalendar.kt
index 5623cbcb4..b492934cc 100644
--- a/app/src/main/java/org/tasks/data/CaldavCalendar.kt
+++ b/app/src/main/java/org/tasks/data/CaldavCalendar.kt
@@ -15,6 +15,7 @@ import org.tasks.themes.CustomIcons.LIST
 class CaldavCalendar : Parcelable {
     @PrimaryKey(autoGenerate = true)
     @ColumnInfo(name = "cdl_id")
+    @Transient
     var id: Long = 0
 
     @ColumnInfo(name = "cdl_account")
diff --git a/app/src/main/res/values/changelog.xml b/app/src/main/res/values/changelog.xml
index ac2650416..429359881 100644
--- a/app/src/main/res/values/changelog.xml
+++ b/app/src/main/res/values/changelog.xml
@@ -3,6 +3,7 @@
     <string-array name="changelog">
         <item>Added \'☰ > Manage lists\'\n\t- Drag and drop to rearrange the drawer\n\t- Tap to edit or delete a list</item>
         <item>Display 2 additional snooze options - @rangzen</item>
+        <item>Fix crash on backup import</item>
         <item>Update translations</item>
     </string-array>
 </resources>
diff --git a/fastlane/metadata/android/en-US/changelogs/90701.txt b/fastlane/metadata/android/en-US/changelogs/90701.txt
new file mode 100644
index 000000000..6b69ec907
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/90701.txt
@@ -0,0 +1 @@
+* Fix crash on backup import