Refactor connectivity check
This commit is contained in:
parent
f56861a3c2
commit
d654b1b0bd
@ -63,7 +63,7 @@ class Repository(private val api: SelfossApi, private val apiDetails: ApiDetails
|
|||||||
|
|
||||||
suspend fun getNewerItems(): ArrayList<SelfossModel.Item> {
|
suspend fun getNewerItems(): ArrayList<SelfossModel.Item> {
|
||||||
// TODO: Use the updatedSince parameter
|
// TODO: Use the updatedSince parameter
|
||||||
if (isConnectionAvailable.value && !offlineOverride) {
|
if (isNetworkAvailable()) {
|
||||||
val fetchedItems = api.getItems(
|
val fetchedItems = api.getItems(
|
||||||
displayedItems.type,
|
displayedItems.type,
|
||||||
settings.getString("prefer_api_items_number", "200").toInt(),
|
settings.getString("prefer_api_items_number", "200").toInt(),
|
||||||
@ -84,7 +84,7 @@ class Repository(private val api: SelfossApi, private val apiDetails: ApiDetails
|
|||||||
}
|
}
|
||||||
|
|
||||||
suspend fun getOlderItems(): ArrayList<SelfossModel.Item> {
|
suspend fun getOlderItems(): ArrayList<SelfossModel.Item> {
|
||||||
if (isConnectionAvailable.value && !offlineOverride) {
|
if (isNetworkAvailable()) {
|
||||||
val offset = items.size
|
val offset = items.size
|
||||||
val fetchedItems = api.getItems(
|
val fetchedItems = api.getItems(
|
||||||
displayedItems.type,
|
displayedItems.type,
|
||||||
@ -106,7 +106,7 @@ class Repository(private val api: SelfossApi, private val apiDetails: ApiDetails
|
|||||||
}
|
}
|
||||||
|
|
||||||
suspend fun allItems(itemType: ItemType): List<SelfossModel.Item>? {
|
suspend fun allItems(itemType: ItemType): List<SelfossModel.Item>? {
|
||||||
return if (isConnectionAvailable.value && !offlineOverride) {
|
return if (isNetworkAvailable()) {
|
||||||
api.getItems(
|
api.getItems(
|
||||||
itemType.type,
|
itemType.type,
|
||||||
200,
|
200,
|
||||||
@ -137,7 +137,7 @@ class Repository(private val api: SelfossApi, private val apiDetails: ApiDetails
|
|||||||
|
|
||||||
suspend fun reloadBadges(): Boolean {
|
suspend fun reloadBadges(): Boolean {
|
||||||
var success = false
|
var success = false
|
||||||
if (isConnectionAvailable.value && !offlineOverride) {
|
if (isNetworkAvailable()) {
|
||||||
val response = api.stats()
|
val response = api.stats()
|
||||||
if (response != null) {
|
if (response != null) {
|
||||||
badgeUnread = response.unread
|
badgeUnread = response.unread
|
||||||
@ -153,7 +153,7 @@ class Repository(private val api: SelfossApi, private val apiDetails: ApiDetails
|
|||||||
|
|
||||||
suspend fun getTags(): List<SelfossModel.Tag>? {
|
suspend fun getTags(): List<SelfossModel.Tag>? {
|
||||||
// TODO: Store in DB
|
// TODO: Store in DB
|
||||||
return if (isConnectionAvailable.value && !offlineOverride) {
|
return if (isNetworkAvailable()) {
|
||||||
api.tags()
|
api.tags()
|
||||||
} else {
|
} else {
|
||||||
// TODO: Compute from database
|
// TODO: Compute from database
|
||||||
@ -163,7 +163,7 @@ class Repository(private val api: SelfossApi, private val apiDetails: ApiDetails
|
|||||||
|
|
||||||
suspend fun getSpouts(): Map<String, SelfossModel.Spout>? {
|
suspend fun getSpouts(): Map<String, SelfossModel.Spout>? {
|
||||||
// TODO: Store in DB
|
// TODO: Store in DB
|
||||||
return if (isConnectionAvailable.value && !offlineOverride) {
|
return if (isNetworkAvailable()) {
|
||||||
api.spouts()
|
api.spouts()
|
||||||
} else {
|
} else {
|
||||||
// TODO: Compute from database
|
// TODO: Compute from database
|
||||||
@ -173,7 +173,7 @@ class Repository(private val api: SelfossApi, private val apiDetails: ApiDetails
|
|||||||
|
|
||||||
suspend fun getSources(): ArrayList<SelfossModel.Source>? {
|
suspend fun getSources(): ArrayList<SelfossModel.Source>? {
|
||||||
// TODO: Store in DB
|
// TODO: Store in DB
|
||||||
return if (isConnectionAvailable.value && !offlineOverride) {
|
return if (isNetworkAvailable()) {
|
||||||
api.sources()
|
api.sources()
|
||||||
} else {
|
} else {
|
||||||
// TODO: Compute from database
|
// TODO: Compute from database
|
||||||
@ -192,7 +192,7 @@ class Repository(private val api: SelfossApi, private val apiDetails: ApiDetails
|
|||||||
|
|
||||||
suspend fun markAsReadById(id: Int): Boolean {
|
suspend fun markAsReadById(id: Int): Boolean {
|
||||||
var success = false
|
var success = false
|
||||||
if (isConnectionAvailable.value && !offlineOverride) {
|
if (isNetworkAvailable()) {
|
||||||
success = api.markAsRead(id.toString())?.isSuccess == true
|
success = api.markAsRead(id.toString())?.isSuccess == true
|
||||||
}
|
}
|
||||||
return success
|
return success
|
||||||
@ -209,7 +209,7 @@ class Repository(private val api: SelfossApi, private val apiDetails: ApiDetails
|
|||||||
|
|
||||||
suspend fun unmarkAsReadById(id: Int): Boolean {
|
suspend fun unmarkAsReadById(id: Int): Boolean {
|
||||||
var success = false
|
var success = false
|
||||||
if (isConnectionAvailable.value && !offlineOverride) {
|
if (isNetworkAvailable()) {
|
||||||
success = api.unmarkAsRead(id.toString())?.isSuccess == true
|
success = api.unmarkAsRead(id.toString())?.isSuccess == true
|
||||||
}
|
}
|
||||||
return success
|
return success
|
||||||
@ -226,7 +226,7 @@ class Repository(private val api: SelfossApi, private val apiDetails: ApiDetails
|
|||||||
|
|
||||||
suspend fun starrById(id: Int): Boolean {
|
suspend fun starrById(id: Int): Boolean {
|
||||||
var success = false
|
var success = false
|
||||||
if (isConnectionAvailable.value && !offlineOverride) {
|
if (isNetworkAvailable()) {
|
||||||
success = api.starr(id.toString())?.isSuccess == true
|
success = api.starr(id.toString())?.isSuccess == true
|
||||||
}
|
}
|
||||||
return success
|
return success
|
||||||
@ -243,7 +243,7 @@ class Repository(private val api: SelfossApi, private val apiDetails: ApiDetails
|
|||||||
|
|
||||||
suspend fun unstarrById(id: Int): Boolean {
|
suspend fun unstarrById(id: Int): Boolean {
|
||||||
var success = false
|
var success = false
|
||||||
if (isConnectionAvailable.value && !offlineOverride) {
|
if (isNetworkAvailable()) {
|
||||||
success = api.unstarr(id.toString())?.isSuccess == true
|
success = api.unstarr(id.toString())?.isSuccess == true
|
||||||
}
|
}
|
||||||
return success
|
return success
|
||||||
@ -252,7 +252,7 @@ class Repository(private val api: SelfossApi, private val apiDetails: ApiDetails
|
|||||||
|
|
||||||
suspend fun markAllAsRead(items: ArrayList<SelfossModel.Item>): Boolean {
|
suspend fun markAllAsRead(items: ArrayList<SelfossModel.Item>): Boolean {
|
||||||
var success = false
|
var success = false
|
||||||
if (isConnectionAvailable.value && !offlineOverride) {
|
if (isNetworkAvailable()) {
|
||||||
success = api.markAllAsRead(items.map { it.id.toString() })?.isSuccess == true
|
success = api.markAllAsRead(items.map { it.id.toString() })?.isSuccess == true
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -304,7 +304,7 @@ class Repository(private val api: SelfossApi, private val apiDetails: ApiDetails
|
|||||||
filter: String
|
filter: String
|
||||||
): Boolean {
|
): Boolean {
|
||||||
var response = false
|
var response = false
|
||||||
if (isConnectionAvailable.value && !offlineOverride) {
|
if (isNetworkAvailable()) {
|
||||||
response = api.createSourceForVersion(
|
response = api.createSourceForVersion(
|
||||||
title,
|
title,
|
||||||
url,
|
url,
|
||||||
@ -321,7 +321,7 @@ class Repository(private val api: SelfossApi, private val apiDetails: ApiDetails
|
|||||||
suspend fun deleteSource(id: Int): Boolean {
|
suspend fun deleteSource(id: Int): Boolean {
|
||||||
// TODO: Store in DB
|
// TODO: Store in DB
|
||||||
var success = false
|
var success = false
|
||||||
if (isConnectionAvailable.value && !offlineOverride) {
|
if (isNetworkAvailable()) {
|
||||||
val response = api.deleteSource(id)
|
val response = api.deleteSource(id)
|
||||||
if (response != null) {
|
if (response != null) {
|
||||||
success = response.isSuccess
|
success = response.isSuccess
|
||||||
@ -342,7 +342,7 @@ class Repository(private val api: SelfossApi, private val apiDetails: ApiDetails
|
|||||||
|
|
||||||
suspend fun login(): Boolean {
|
suspend fun login(): Boolean {
|
||||||
var result = false
|
var result = false
|
||||||
if (isConnectionAvailable.value && !offlineOverride) {
|
if (isNetworkAvailable()) {
|
||||||
try {
|
try {
|
||||||
val response = api.login()
|
val response = api.login()
|
||||||
result = response?.isSuccess == true
|
result = response?.isSuccess == true
|
||||||
@ -369,7 +369,7 @@ class Repository(private val api: SelfossApi, private val apiDetails: ApiDetails
|
|||||||
private suspend fun updateApiVersion() {
|
private suspend fun updateApiVersion() {
|
||||||
apiMajorVersion = settings.getInt("apiVersionMajor", 0)
|
apiMajorVersion = settings.getInt("apiVersionMajor", 0)
|
||||||
|
|
||||||
if (isConnectionAvailable.value && !offlineOverride) {
|
if (isNetworkAvailable()) {
|
||||||
val fetchedVersion = api.version()
|
val fetchedVersion = api.version()
|
||||||
if (fetchedVersion != null) {
|
if (fetchedVersion != null) {
|
||||||
apiMajorVersion = fetchedVersion.getApiMajorVersion()
|
apiMajorVersion = fetchedVersion.getApiMajorVersion()
|
||||||
@ -378,5 +378,7 @@ class Repository(private val api: SelfossApi, private val apiDetails: ApiDetails
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private fun isNetworkAvailable() = isConnectionAvailable.value && !offlineOverride
|
||||||
|
|
||||||
// TODO: Handle offline actions
|
// TODO: Handle offline actions
|
||||||
}
|
}
|
Loading…
Reference in New Issue
Block a user