From 3501ac89f0b90ad21dff607f27382294e5f165f9 Mon Sep 17 00:00:00 2001 From: tom79 Date: Sat, 19 Aug 2017 19:10:43 +0200 Subject: [PATCH] Force the flag to false when errors --- .../etalab/mastodon/fragments/DisplayAccountsFragment.java | 3 ++- .../gouv/etalab/mastodon/fragments/DisplayStatusFragment.java | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayAccountsFragment.java b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayAccountsFragment.java index ce1bee52e..207921c4a 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayAccountsFragment.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayAccountsFragment.java @@ -234,7 +234,6 @@ public class DisplayAccountsFragment extends Fragment implements OnRetrieveAccou @Override public void onRetrieveAccounts(APIResponse apiResponse) { - flag_loading = (apiResponse.getMax_id() == null ); mainLoader.setVisibility(View.GONE); nextElementLoader.setVisibility(View.GONE); if( apiResponse.getError() != null){ @@ -244,8 +243,10 @@ public class DisplayAccountsFragment extends Fragment implements OnRetrieveAccou Toast.makeText(context, apiResponse.getError().getError(),Toast.LENGTH_LONG).show(); swipeRefreshLayout.setRefreshing(false); swiped = false; + flag_loading = false; return; } + flag_loading = (apiResponse.getMax_id() == null ); List accounts = apiResponse.getAccounts(); if( !swiped && firstLoad && (accounts == null || accounts.size() == 0)) textviewNoAction.setVisibility(View.VISIBLE); diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayStatusFragment.java b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayStatusFragment.java index 0a57513de..32a8bc443 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayStatusFragment.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayStatusFragment.java @@ -260,7 +260,6 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn @Override public void onRetrieveFeeds(APIResponse apiResponse) { - flag_loading = (apiResponse.getMax_id() == null ); mainLoader.setVisibility(View.GONE); nextElementLoader.setVisibility(View.GONE); //Discards 404 - error which can often happen due to toots which have been deleted @@ -271,9 +270,10 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn Toast.makeText(context, apiResponse.getError().getError(),Toast.LENGTH_LONG).show(); swipeRefreshLayout.setRefreshing(false); swiped = false; + flag_loading = false; return; } - + flag_loading = (apiResponse.getMax_id() == null ); List statuses = apiResponse.getStatuses(); if( !swiped && firstLoad && (statuses == null || statuses.size() == 0)) textviewNoAction.setVisibility(View.VISIBLE);