From ca4c05f11d354f6d1fc7a69aa989092e9888e3a5 Mon Sep 17 00:00:00 2001 From: Jackson Harper Date: Thu, 25 May 2023 10:37:46 +0800 Subject: [PATCH 1/2] Cascade highlight deletes --- .../main/java/app/omnivore/omnivore/persistence/AppDatabase.kt | 2 +- .../app/omnivore/omnivore/persistence/entities/Highlight.kt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/persistence/AppDatabase.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/persistence/AppDatabase.kt index 905ff30bf..ac7d582c0 100644 --- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/persistence/AppDatabase.kt +++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/persistence/AppDatabase.kt @@ -13,7 +13,7 @@ import app.omnivore.omnivore.persistence.entities.* SavedItemAndSavedItemLabelCrossRef::class, SavedItemAndHighlightCrossRef::class ], - version = 7 + version = 8 ) abstract class AppDatabase : RoomDatabase() { abstract fun viewerDao(): ViewerDao diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/persistence/entities/Highlight.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/persistence/entities/Highlight.kt index a54bc679b..0071697c6 100644 --- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/persistence/entities/Highlight.kt +++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/persistence/entities/Highlight.kt @@ -34,6 +34,7 @@ data class Highlight( entity = Highlight::class, parentColumns = arrayOf("highlightId"), childColumns = arrayOf("highlightId"), + onDelete = ForeignKey.CASCADE ), ForeignKey( entity = SavedItem::class, From 1acbd04b012dc1894e3ba8c6cf2b9c473f3d4090 Mon Sep 17 00:00:00 2001 From: Jackson Harper Date: Thu, 25 May 2023 10:53:50 +0800 Subject: [PATCH 2/2] Bump Android version --- android/Omnivore/app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android/Omnivore/app/build.gradle b/android/Omnivore/app/build.gradle index 78deb3e8b..db0079448 100644 --- a/android/Omnivore/app/build.gradle +++ b/android/Omnivore/app/build.gradle @@ -17,8 +17,8 @@ android { applicationId "app.omnivore.omnivore" minSdk 26 targetSdk 33 - versionCode 78 - versionName "0.0.78" + versionCode 80 + versionName "0.0.80" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" vectorDrawables {