davidoskky/ReaderForSelfoss-multiplatform
1
0
Fork 0
forked from Louvorg/ReaderForSelfoss-multiplatform
Code Issues Pull Requests Projects Releases Wiki Activity

Perform network connectivity checks in the repository

Browse Source
This commit is contained in:
davidoskky 2022-08-17 15:14:58 +02:00
parent 728eb747c3
commit b7b4ff1485
1 changed files with 152 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

240
shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/repository/RepositoryImpl.kt
View File

@ -48,40 +48,65 @@ class Repository(private val api: SelfossApi, private val apiDetails: ApiDetails
} }
suspend fun getNewerItems(): ArrayList<SelfossModel.Item> { suspend fun getNewerItems(): ArrayList<SelfossModel.Item> {
// TODO: Check connectivity, use the updatedSince parameter // TODO: Use the updatedSince parameter
val fetchedItems = api.getItems(displayedItems.type, if (isConnectionAvailable.value) {
settings.getString("prefer_api_items_number", "200").toInt(), val fetchedItems = api.getItems(
offset = 0, displayedItems.type,
tagFilter?.tag, settings.getString("prefer_api_items_number", "200").toInt(),
sourceFilter?.id?.toLong(), offset = 0,
searchFilter, tagFilter?.tag,
null) sourceFilter?.id?.toLong(),
searchFilter,
null
)
if (fetchedItems != null) { if (fetchedItems != null) {
items = ArrayList(fetchedItems) items = ArrayList(fetchedItems)
}
} else {
// TODO: Provide an error message if the connection is not available.
// TODO: Get items from the database
} }
return items return items
} }
suspend fun getOlderItems(): ArrayList<SelfossModel.Item> { suspend fun getOlderItems(): ArrayList<SelfossModel.Item> {
// TODO: Check connectivity if (isConnectionAvailable.value) {
val offset = items.size val offset = items.size
val fetchedItems = api.getItems(displayedItems.type, val fetchedItems = api.getItems(
settings.getString("prefer_api_items_number", "200").toInt(), displayedItems.type,
offset, settings.getString("prefer_api_items_number", "200").toInt(),
tagFilter?.tag, offset,
sourceFilter?.id?.toLong(), tagFilter?.tag,
searchFilter, sourceFilter?.id?.toLong(),
null) searchFilter,
null
)
if (fetchedItems != null) { if (fetchedItems != null) {
appendItems(fetchedItems) appendItems(fetchedItems)
}
} else {
// TODO: Provide an error message
} }
return items return items
} }
suspend fun allItems(itemType: ItemType): List<SelfossModel.Item>? = suspend fun allItems(itemType: ItemType): List<SelfossModel.Item>? {
api.getItems(itemType.type, 200, 0, tagFilter?.tag, sourceFilter?.id?.toLong(), searchFilter, null) return if (isConnectionAvailable.value) {
api.getItems(
itemType.type,
200,
0,
tagFilter?.tag,
sourceFilter?.id?.toLong(),
searchFilter,
null
)
} else {
null
}
}
private fun appendItems(fetchedItems: List<SelfossModel.Item>) { private fun appendItems(fetchedItems: List<SelfossModel.Item>) {
// TODO: Store in DB if enabled by user // TODO: Store in DB if enabled by user
@ -97,82 +122,114 @@ class Repository(private val api: SelfossApi, private val apiDetails: ApiDetails
} }
suspend fun reloadBadges(): Boolean { suspend fun reloadBadges(): Boolean {
// TODO: Check connectivity, calculate from DB
var success = false var success = false
val response = api.stats() if (isConnectionAvailable.value) {
if (response != null) { val response = api.stats()
badgeUnread = response.unread if (response != null) {
badgeAll = response.total badgeUnread = response.unread
badgeStarred = response.starred badgeAll = response.total
success = true badgeStarred = response.starred
success = true
}
} else {
// TODO: Compute badges from database
} }
return success return success
} }
suspend fun getTags(): List<SelfossModel.Tag>? { suspend fun getTags(): List<SelfossModel.Tag>? {
// TODO: Check success, store in DB // TODO: Store in DB
return api.tags() return if (isConnectionAvailable.value) {
api.tags()
} else {
// TODO: Compute from database
null
}
} }
suspend fun getSpouts(): Map<String, SelfossModel.Spout>? { suspend fun getSpouts(): Map<String, SelfossModel.Spout>? {
// TODO: Check success, store in DB // TODO: Store in DB
return api.spouts() return if (isConnectionAvailable.value) {
api.spouts()
} else {
// TODO: Compute from database
null
}
} }
suspend fun getSources(): ArrayList<SelfossModel.Source>? { suspend fun getSources(): ArrayList<SelfossModel.Source>? {
// TODO: Check success // TODO: Store in DB
return api.sources() return if (isConnectionAvailable.value) {
api.sources()
} else {
// TODO: Compute from database
null
}
} }
suspend fun markAsRead(id: Int): Boolean { suspend fun markAsRead(id: Int): Boolean {
// TODO: Check internet connection var success = false
val success = api.markAsRead(id.toString())?.isSuccess == true
if (success) { if (isConnectionAvailable.value) {
markAsReadLocally(items.first {it.id == id}) success = api.markAsRead(id.toString())?.isSuccess == true
if (success) {
markAsReadLocally(items.first { it.id == id })
}
} }
return success return success
} }
suspend fun unmarkAsRead(id: Int): Boolean { suspend fun unmarkAsRead(id: Int): Boolean {
// TODO: Check internet connection var success = false
val success = api.unmarkAsRead(id.toString())?.isSuccess == true
if (success) { if (isConnectionAvailable.value) {
unmarkAsReadLocally(items.first {it.id == id}) success = api.unmarkAsRead(id.toString())?.isSuccess == true
if (success) {
unmarkAsReadLocally(items.first { it.id == id })
}
} }
return success return success
} }
suspend fun starr(id: Int): Boolean { suspend fun starr(id: Int): Boolean {
// TODO: Check success, store in DB var success = false
val success = api.starr(id.toString())?.isSuccess == true
if (success) { if (isConnectionAvailable.value) {
starrLocally(items.first {it.id == id}) success = api.starr(id.toString())?.isSuccess == true
if (success) {
starrLocally(items.first { it.id == id })
}
} }
return success return success
} }
suspend fun unstarr(id: Int): Boolean { suspend fun unstarr(id: Int): Boolean {
// TODO: Check internet connection var success = false
val success = api.unstarr(id.toString())?.isSuccess == true
if (success) { if (isConnectionAvailable.value) {
unstarrLocally(items.first {it.id == id}) success = api.unstarr(id.toString())?.isSuccess == true
if (success) {
unstarrLocally(items.first { it.id == id })
}
} }
return success return success
} }
suspend fun markAllAsRead(ids: List<Int>): Boolean { suspend fun markAllAsRead(ids: List<Int>): Boolean {
// TODO: Check Internet connectivity, store in DB var success = false
val success = api.markAllAsRead(ids.map { it.toString() })?.isSuccess == true if (isConnectionAvailable.value) {
success = api.markAllAsRead(ids.map { it.toString() })?.isSuccess == true
if (success) { if (success) {
val itemsToMark = items.filter { it.id in ids } val itemsToMark = items.filter { it.id in ids }
for (item in itemsToMark) { for (item in itemsToMark) {
markAsReadLocally(item) markAsReadLocally(item)
}
} }
} }
return success return success
@ -217,45 +274,51 @@ class Repository(private val api: SelfossApi, private val apiDetails: ApiDetails
tags: String, tags: String,
filter: String filter: String
): Boolean { ): Boolean {
// TODO: Check connectivity var response = false
val response = api.createSourceForVersion( if (isConnectionAvailable.value) {
title, response = api.createSourceForVersion(
url, title,
spout, url,
tags, spout,
filter, tags,
apiMajorVersion filter,
) apiMajorVersion
)?.isSuccess == true
}
return response != null return response
} }
suspend fun deleteSource(id: Int): Boolean { suspend fun deleteSource(id: Int): Boolean {
// TODO: Check connectivity, store in DB // TODO: Store in DB
var success = false var success = false
val response = api.deleteSource(id) if (isConnectionAvailable.value) {
if (response != null) { val response = api.deleteSource(id)
success = response.isSuccess if (response != null) {
success = response.isSuccess
}
} }
return success return success
} }
suspend fun updateRemote(): Boolean { suspend fun updateRemote(): Boolean {
// TODO: Handle connectivity issues var response = false
val response = api.update() if (isConnectionAvailable.value) {
return response?.isSuccess ?: false response = api.update()?.isSuccess == true
}
return response
} }
suspend fun login(): Boolean { suspend fun login(): Boolean {
var result = false var result = false
try { if (isConnectionAvailable.value) {
val response = api.login() try {
if (response != null && response.isSuccess) { val response = api.login()
result = true result = response?.isSuccess == true
} catch (cause: Throwable) {
Napier.e(cause.stackTraceToString(), tag = "RepositoryImpl.updateRemote")
} }
} catch (cause: Throwable) {
Napier.e(cause.stackTraceToString(),tag = "RepositoryImpl.updateRemote")
} }
return result return result
} }
@ -274,13 +337,14 @@ class Repository(private val api: SelfossApi, private val apiDetails: ApiDetails
} }
private suspend fun updateApiVersion() { private suspend fun updateApiVersion() {
// TODO: Handle connectivity issues apiMajorVersion = settings.getInt("apiVersionMajor", 0)
val fetchedVersion = api.version()
if (fetchedVersion != null) { if (isConnectionAvailable.value) {
apiMajorVersion = fetchedVersion.getApiMajorVersion() val fetchedVersion = api.version()
settings.putInt("apiVersionMajor", apiMajorVersion) if (fetchedVersion != null) {
} else { apiMajorVersion = fetchedVersion.getApiMajorVersion()
apiMajorVersion = settings.getInt("apiVersionMajor", 0) settings.putInt("apiVersionMajor", apiMajorVersion)
}
} }
} }