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 10ab31200..97260c72d 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 @@ -148,9 +148,7 @@ suspend fun Networker.createHighlight(input: CreateHighlightInput): Highlight? { annotation = createdHighlight.highlightFields.annotation, createdAt = null, // TODO: update gql query to get this updatedAt = null, // TODO: fix updatedAtString?.let { LocalDate.parse(it) }, - createdByMe = createdHighlight.highlightFields.createdByMe, - markedForDeletion = false, - serverSyncStatus = 0 + createdByMe = createdHighlight.highlightFields.createdByMe ) } else { return null 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 eb2822697..9cc667461 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 @@ -51,9 +51,7 @@ suspend fun Networker.savedItem(slug: String): SavedItemQueryResponse { annotation = it.highlightFields.annotation, createdAt = null, // TODO: update gql query to get this updatedAt = null, //updatedAtString?.let { str -> LocalDate.parse(str) }, TODO: fix date parsing - createdByMe = it.highlightFields.createdByMe, - markedForDeletion = false, - serverSyncStatus = 0 + createdByMe = it.highlightFields.createdByMe ) } 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 31ecae2cd..0c4588741 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 @@ -1,6 +1,7 @@ package app.omnivore.omnivore.persistence.entities import androidx.room.* +import app.omnivore.omnivore.models.ServerSyncStatus import java.time.LocalDate import java.util.Date @@ -10,11 +11,11 @@ data class Highlight( val annotation: String?, val createdAt: String?, val createdByMe: Boolean, - val markedForDeletion: Boolean, // default false + val markedForDeletion: Boolean = false, val patch: String, val prefix: String?, val quote: String, - val serverSyncStatus: Int, // default 0 + val serverSyncStatus: Int = ServerSyncStatus.IS_SYNCED.rawValue, val shortId: String, val suffix: String?, val updatedAt: String? diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/library/LibraryViewModel.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/library/LibraryViewModel.kt index a67afa781..84da2262a 100644 --- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/library/LibraryViewModel.kt +++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/library/LibraryViewModel.kt @@ -84,10 +84,10 @@ class LibraryViewModel @Inject constructor( dataService.syncOfflineItemsWithServerIfNeeded() val result = dataService.sync(since = since, cursor = cursor) - // TODO: Defer this until later? - for (slug in result.savedItemSlugs) { - dataService.syncSavedItemContent(slug) - } + // TODO: Defer this until later? /fix - this results in a 429 server error +// for (slug in result.savedItemSlugs) { +// dataService.syncSavedItemContent(slug) +// } val totalCount = count + result.count