Mark caldav list and account ids as transient

pull/1025/head
Alex Baker 6 years ago
parent 06a912ad31
commit e641d71e35

@ -1,6 +1,10 @@
Change Log Change Log
--- ---
======= =======
### 9.7.1 (2020-06-18)
* Fix crash on backup import
### 9.7 (2020-06-12) ### 9.7 (2020-06-12)
* Added '☰ > Manage lists' * Added '☰ > Manage lists'

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

@ -18,6 +18,7 @@ import org.tasks.security.KeyStoreEncryption
class CaldavAccount : Parcelable { class CaldavAccount : Parcelable {
@PrimaryKey(autoGenerate = true) @PrimaryKey(autoGenerate = true)
@ColumnInfo(name = "cda_id") @ColumnInfo(name = "cda_id")
@Transient
var id: Long = 0 var id: Long = 0
@ColumnInfo(name = "cda_uuid") @ColumnInfo(name = "cda_uuid")

@ -15,6 +15,7 @@ import org.tasks.themes.CustomIcons.LIST
class CaldavCalendar : Parcelable { class CaldavCalendar : Parcelable {
@PrimaryKey(autoGenerate = true) @PrimaryKey(autoGenerate = true)
@ColumnInfo(name = "cdl_id") @ColumnInfo(name = "cdl_id")
@Transient
var id: Long = 0 var id: Long = 0
@ColumnInfo(name = "cdl_account") @ColumnInfo(name = "cdl_account")

@ -3,6 +3,7 @@
<string-array name="changelog"> <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>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>Display 2 additional snooze options - @rangzen</item>
<item>Fix crash on backup import</item>
<item>Update translations</item> <item>Update translations</item>
</string-array> </string-array>
</resources> </resources>

Loading…
Cancel
Save