diff --git a/android/Omnivore/app/src/main/graphql/ArticleContent.graphql b/android/Omnivore/app/src/main/graphql/ArticleContent.graphql index ea8a8380f..79dcf6456 100644 --- a/android/Omnivore/app/src/main/graphql/ArticleContent.graphql +++ b/android/Omnivore/app/src/main/graphql/ArticleContent.graphql @@ -45,6 +45,7 @@ fragment ArticleFields on Article { fragment HighlightFields on Highlight { id + type shortId quote prefix diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/dataService/HighlightActionHandlers.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/dataService/HighlightActionHandlers.kt index 8b539b918..97d545506 100644 --- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/dataService/HighlightActionHandlers.kt +++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/dataService/HighlightActionHandlers.kt @@ -13,6 +13,7 @@ suspend fun DataService.createWebHighlight(jsonString: String) { withContext(Dispatchers.IO) { val highlight = Highlight( + type = "HIGHLIGHT", highlightId = createHighlightInput.id, shortId = createHighlightInput.shortId, quote = createHighlightInput.quote.getOrNull(), diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/dataService/LibrarySync.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/dataService/LibrarySync.kt index d98fd27b2..3a93489d2 100644 --- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/dataService/LibrarySync.kt +++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/dataService/LibrarySync.kt @@ -113,6 +113,7 @@ suspend fun DataService.sync(since: String, cursor: String?, limit: Int = 20): S it.highlights ?: listOf() }.map { Highlight( + type = it.highlightFields.type.toString(), highlightId = it.highlightFields.id, annotation = it.highlightFields.annotation, createdByMe = it.highlightFields.createdByMe, diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/networking/HighlightMutations.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/networking/HighlightMutations.kt index baf676707..2d272f732 100644 --- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/networking/HighlightMutations.kt +++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/networking/HighlightMutations.kt @@ -139,6 +139,7 @@ suspend fun Networker.createHighlight(input: CreateHighlightInput): Highlight? { // val updatedAtString = createdHighlight.highlightFields.updatedAt as? String return Highlight( + type = createdHighlight.highlightFields.type.toString(), highlightId = createdHighlight.highlightFields.id, shortId = createdHighlight.highlightFields.shortId, quote = createdHighlight.highlightFields.quote, diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/networking/SavedItemQuery.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/networking/SavedItemQuery.kt index bfad2f85b..134f09d45 100644 --- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/networking/SavedItemQuery.kt +++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/networking/SavedItemQuery.kt @@ -44,6 +44,7 @@ suspend fun Networker.savedItem(slug: String): SavedItemQueryResponse { Highlight( highlightId = it.highlightFields.id, + type = it.highlightFields.type.toString(), shortId = it.highlightFields.shortId, quote = it.highlightFields.quote, prefix = it.highlightFields.prefix, diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/networking/SearchQuery.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/networking/SearchQuery.kt index 8f21c8e73..fcfab3114 100644 --- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/networking/SearchQuery.kt +++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/networking/SearchQuery.kt @@ -71,6 +71,7 @@ suspend fun Networker.search( highlights = (it.node.highlights ?: listOf()).map { highlight -> Highlight( highlightId = highlight.highlightFields.id, + type = highlight.highlightFields.type.toString(), annotation = highlight.highlightFields.annotation, createdByMe = highlight.highlightFields.createdByMe, patch = highlight.highlightFields.patch, 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 5d8322175..dc30a3c09 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 = 5 + version = 6 ) 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 fa7b6a45e..e9bb1a6ab 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 @@ -7,6 +7,7 @@ import app.omnivore.omnivore.models.ServerSyncStatus @Entity data class Highlight( @PrimaryKey val highlightId: String, + val type: String, var annotation: String?, val createdAt: String?, val createdByMe: Boolean,