From a0c835779335d37d0524ec4bf93bfe2198cce9b6 Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Wed, 3 Jul 2019 12:51:21 -0700 Subject: Cancel image loading if activity is not found --- app/src/main/kotlin/com/pitchedapps/frost/StartActivity.kt | 1 + .../main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt | 6 ++++++ app/src/main/res/values/strings_errors.xml | 1 + 3 files changed, 8 insertions(+) (limited to 'app') diff --git a/app/src/main/kotlin/com/pitchedapps/frost/StartActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/StartActivity.kt index 61b4a194..8a8e48c9 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/StartActivity.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/StartActivity.kt @@ -46,6 +46,7 @@ import com.pitchedapps.frost.utils.BiometricUtils import com.pitchedapps.frost.utils.EXTRA_COOKIES import com.pitchedapps.frost.utils.L import com.pitchedapps.frost.utils.Prefs +import com.pitchedapps.frost.utils.launchImageActivity import com.pitchedapps.frost.utils.launchNewTask import com.pitchedapps.frost.utils.loadAssets import com.raizlabs.android.dbflow.kotlinextensions.from diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt index c7d31032..7f52d500 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt @@ -39,6 +39,7 @@ import ca.allanwang.kau.utils.materialDialog import ca.allanwang.kau.utils.scaleXY import ca.allanwang.kau.utils.setIcon import ca.allanwang.kau.utils.tint +import ca.allanwang.kau.utils.toast import ca.allanwang.kau.utils.withAlpha import ca.allanwang.kau.utils.withMinAlpha import com.davemorrissey.labs.subscaleview.ImageSource @@ -145,6 +146,11 @@ class ImageActivity : KauBaseActivity() { else Prefs.bgColor.withMinAlpha(235) private fun loadError(e: Throwable) { + if (e.message?.contains("") == true) { + applicationContext.toast(R.string.image_not_found) + finish() + return + } errorRef = e e.logFrostEvent("Image load error") if (image_progress.isVisible) diff --git a/app/src/main/res/values/strings_errors.xml b/app/src/main/res/values/strings_errors.xml index 0cec420c..72a30563 100644 --- a/app/src/main/res/values/strings_errors.xml +++ b/app/src/main/res/values/strings_errors.xml @@ -11,4 +11,5 @@ An error occurred when fetching notifications Your device\'s SDK (%d) is incompatible. Frost only supports Lollipop (SDK 21) and above Your device does not seem to have a webview. Please add or enable one. + Image not found. \ No newline at end of file -- cgit v1.2.3