Merge tag '9.7.1'

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'

app/build.gradle.kts

@@ -44,8 +44,8 @@ android {
     defaultConfig {
         testApplicationId = "org.tasks.test"
         applicationId = "org.tasks"
-        versionCode = 90700
+        versionCode = 90701
-        versionName = "9.7"
+        versionName = "9.7.1"
         targetSdkVersion(Versions.targetSdk)
         minSdkVersion(Versions.minSdk)
         testInstrumentationRunner = "org.tasks.TestRunner"

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")

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")

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>

fastlane/metadata/android/en-US/changelogs/90701.txt

@@ -0,0 +1 @@
+* Fix crash on backup import