From 9f3c8c58273b441ca7d73af8e73f637514793194 Mon Sep 17 00:00:00 2001 From: Niko Diamadis Date: Wed, 22 Jun 2022 20:32:12 +0200 Subject: [PATCH] =?UTF-8?q?Fixe=20anf=C3=A4ngliche=20Error-Meldung=20bei?= =?UTF-8?q?=20leerem=20Cache?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../techniklogger/fragments/ListingFragment.kt | 17 ++++++++++++----- .../techniklogger/fragments/YearsFragment.kt | 17 ++++++++++++----- 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/com/cyb3rko/techniklogger/fragments/ListingFragment.kt b/app/src/main/java/com/cyb3rko/techniklogger/fragments/ListingFragment.kt index 73b57be..b74306e 100644 --- a/app/src/main/java/com/cyb3rko/techniklogger/fragments/ListingFragment.kt +++ b/app/src/main/java/com/cyb3rko/techniklogger/fragments/ListingFragment.kt @@ -161,12 +161,19 @@ class ListingFragment : Fragment() { } }) } else { - binding.swipeRefreshLayout.isRefreshing = false - if (projectsAdapter.currentList.isEmpty()) { - showAnimation(true, false) + if (e.message != null) { + if (e.message != "results not cached") { + binding.swipeRefreshLayout.isRefreshing = false + if (projectsAdapter.currentList.isEmpty()) { + showAnimation(true, false) + } + Toasty.error(myContext, "Abruf fehlgeschlagen", Toasty.LENGTH_SHORT).show() + Log.e("TechnikLogger.EinsSuche", e.message.toString()) + e.printStackTrace() + } else { + Log.d("TechnikLogger.EinsSuche", "Empty cache, fetching data immediately.") + } } - Toasty.error(myContext, "Abruf fehlgeschlagen", Toasty.LENGTH_SHORT).show() - Log.e("TechnikLogger.EinsSuche", e.message.toString()) } } } diff --git a/app/src/main/java/com/cyb3rko/techniklogger/fragments/YearsFragment.kt b/app/src/main/java/com/cyb3rko/techniklogger/fragments/YearsFragment.kt index 42c92b9..ceb0f14 100644 --- a/app/src/main/java/com/cyb3rko/techniklogger/fragments/YearsFragment.kt +++ b/app/src/main/java/com/cyb3rko/techniklogger/fragments/YearsFragment.kt @@ -112,12 +112,19 @@ class YearsFragment : Fragment() { yearAdapter.submitList(data) (requireActivity() as MainActivity).setActionBarSubtitle(objects.size.toString()) } else { - binding.swipeRefreshLayout.isRefreshing = false - if (data.isEmpty()) { - showAnimation(true, false) + if (e.message != null) { + if (e.message != "results not cached") { + binding.swipeRefreshLayout.isRefreshing = false + if (data.isEmpty()) { + showAnimation(true, false) + } + Toasty.error(myContext, "Abruf fehlgeschlagen", Toasty.LENGTH_SHORT).show() + Log.e("TechnikLogger.JahrSuche", e.message.toString()) + e.printStackTrace() + } else { + Log.d("TechnikLogger.EinsSuche", "Empty cache, fetching data immediately.") + } } - Toasty.error(myContext, "Abruf fehlgeschlagen", Toasty.LENGTH_SHORT).show() - Log.e("TechnikLogger.JahrSuche", e.message.toString()) } } }