Merge pull request #2114 from omnivore-app/fix/android-highlight-loading

Set type on highlight objects so they are properly loaded

android/Omnivore/app/build.gradle

@@ -17,8 +17,8 @@ android {
         applicationId "app.omnivore.omnivore"
         minSdk 26
         targetSdk 33
-        versionCode 44
-        versionName "0.0.44"
+        versionCode 46
+        versionName "0.0.46"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {

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

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(),

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,

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,

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,

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,

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

android/Omnivore/app/src/main/java/app/omnivore/omnivore/persistence/entities/Highlight.kt

@@ -2,11 +2,14 @@ package app.omnivore.omnivore.persistence.entities
 
 import androidx.room.*
 import app.omnivore.omnivore.models.ServerSyncStatus
+import com.google.gson.annotations.SerializedName
 
 
 @Entity
 data class Highlight(
+  @SerializedName("id")
   @PrimaryKey val highlightId: String,
+  val type: String,
   var annotation: String?,
   val createdAt: String?,
   val createdByMe: Boolean,

packages/appreader/package.json

@@ -4,7 +4,7 @@
   "private": true,
   "scripts": {
     "build": "webpack --mode production",
-    "build-and-update": "yarn build && cp build/bundle.js ../../apple/OmnivoreKit/Sources/Views/Resources/bundle.js"
+    "build-and-update": "yarn build && cp build/bundle.js ../../apple/OmnivoreKit/Sources/Views/Resources/bundle.js && cp build/bundle.js ../../android/Omnivore/app/src/main/assets/bundle.js"
   },
   "dependencies": {
     "@omnivore/web": "1.0.0"