Merge pull request #3856 from omnivore-app/fix/android-offline-and-intercom

Fix offline content and intercom opening on Android
This commit is contained in:
Jackson Harper 2024-04-23 18:57:06 -07:00 committed by GitHub
commit 8567e9875c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 8 additions and 7 deletions

View file

@ -27,8 +27,8 @@ android {
applicationId = "app.omnivore.omnivore"
minSdk = 26
targetSdk = 34
versionCode = 2000050
versionName = "0.200.5"
versionCode = 2000080
versionName = "0.200.8"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables {

View file

@ -5,6 +5,7 @@
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" tools:remove="android:maxSdkVersion" />
<application
android:name=".OmnivoreApplication"

File diff suppressed because one or more lines are too long

View file

@ -1,5 +1,5 @@
query Search($after: String, $first: Int, $query: String) {
search(first: $first, after: $after, query: $query) {
search(first: $first, after: $after, query: $query, includeContent: true) {
... on SearchSuccess {
edges {
cursor
@ -38,6 +38,7 @@ query Search($after: String, $first: Int, $query: String) {
savedAt
updatedAt
wordsCount
content
}
}
pageInfo {

View file

@ -62,7 +62,6 @@ suspend fun DataService.sync(since: String, cursor: String?, limit: Int = 20): S
slug = it.slug,
isArchived = it.isArchived,
contentReader = it.contentReader.rawValue,
content = null,
wordsCount = it.wordsCount
)
val labels = it.labels?.map { label ->

View file

@ -56,7 +56,7 @@ suspend fun Networker.search(
slug = it.node.slug,
isArchived = it.node.isArchived,
contentReader = it.node.contentReader.rawValue,
content = null,
content = it.node.content,
wordsCount = it.node.wordsCount,
),
labels = (it.node.labels ?: listOf()).map { label ->

View file

@ -21,7 +21,7 @@ composeMarkdown = "0.3.3"
coreSplashscreen = "1.0.1"
gson = "2.10.1"
hilt = "2.50"
intercom = "15.1.0"
intercom = "15.8.2"
junit4 = "4.13.2"
kotlin = "1.9.22"
ksp = "1.9.22-1.0.17"