diff options
| author | Allan Wang <me@allanwang.ca> | 2018-03-11 19:24:32 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-11 19:24:32 -0400 |
| commit | fe51373f5a95323d64f6d966888a2c6c62a36deb (patch) | |
| tree | 328bf7ab5bf00f01e070e9d84ff71cac59b0ecf1 /app/src/main/kotlin/com/pitchedapps/frost/facebook/requests | |
| parent | 67988a25d83fc10b187fcc821c3ceacfad0195d5 (diff) | |
| download | frost-fe51373f5a95323d64f6d966888a2c6c62a36deb.tar.gz frost-fe51373f5a95323d64f6d966888a2c6c62a36deb.tar.bz2 frost-fe51373f5a95323d64f6d966888a2c6c62a36deb.zip | |
Enhancement/debug mode (#779)
* Update changelog
* Improve debugger
* Remove need for mapping urls
* Remove excess logs
* Clean up
Diffstat (limited to 'app/src/main/kotlin/com/pitchedapps/frost/facebook/requests')
| -rw-r--r-- | app/src/main/kotlin/com/pitchedapps/frost/facebook/requests/FbRequest.kt | 2 | ||||
| -rw-r--r-- | app/src/main/kotlin/com/pitchedapps/frost/facebook/requests/Images.kt | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/facebook/requests/FbRequest.kt b/app/src/main/kotlin/com/pitchedapps/frost/facebook/requests/FbRequest.kt index 45545336..c70ae1ae 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/facebook/requests/FbRequest.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/facebook/requests/FbRequest.kt @@ -130,6 +130,8 @@ fun String.getAuth(): RequestAuth { inline fun <T, reified R : Any, O> Array<T>.zip(crossinline mapper: (List<R>) -> O, crossinline caller: (T) -> R): Single<O> { + if (isEmpty()) + return Single.just(mapper(emptyList())) val singles = map { Single.fromCallable { caller(it) }.subscribeOn(Schedulers.io()) } return Single.zip(singles) { val results = it.mapNotNull { it as? R } diff --git a/app/src/main/kotlin/com/pitchedapps/frost/facebook/requests/Images.kt b/app/src/main/kotlin/com/pitchedapps/frost/facebook/requests/Images.kt index 094e7fc9..453400d3 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/facebook/requests/Images.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/facebook/requests/Images.kt @@ -76,7 +76,8 @@ class HdImageLoading : ModelLoader<HdImageMaybe, InputStream> { class HdImageFetcher(private val model: HdImageMaybe) : DataFetcher<InputStream> { - @Volatile private var cancelled: Boolean = false + @Volatile + private var cancelled: Boolean = false private var urlCall: Call? = null private var inputStream: InputStream? = null @@ -92,7 +93,8 @@ class HdImageFetcher(private val model: HdImageMaybe) : DataFetcher<InputStream> if (!model.isValid) return callback.fail("Model is invalid") model.cookie.fbRequest(fail = { callback.fail("Invalid auth") }) { if (cancelled) return@fbRequest callback.fail("Cancelled") - val url = getFullSizedImage(model.id).invoke() ?: return@fbRequest callback.fail("Null url") + val url = getFullSizedImage(model.id).invoke() + ?: return@fbRequest callback.fail("Null url") if (cancelled) return@fbRequest callback.fail("Cancelled") if (!url.contains("png") && !url.contains("jpg")) return@fbRequest callback.fail("Invalid format") urlCall = Request.Builder().url(url).get().call() |