diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index d7683e4..84fb81f 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/app/src/main/java/ru/volgorobot/vrcatalog/MainActivity.java b/app/src/main/java/ru/volgorobot/vrcatalog/MainActivity.java index aeccc82..563df58 100644 --- a/app/src/main/java/ru/volgorobot/vrcatalog/MainActivity.java +++ b/app/src/main/java/ru/volgorobot/vrcatalog/MainActivity.java @@ -143,7 +143,7 @@ public class MainActivity extends AppCompatActivity private void refreshTree(boolean clean) throws IllegalStateException { - SwipeRefreshLayout mSwipeRefreshLayout = findViewById(R.id.swipeRefreshLayout); + final SwipeRefreshLayout mSwipeRefreshLayout = findViewById(R.id.swipeRefreshLayout); mSwipeRefreshLayout.setRefreshing(true); if(clean) { List list = new ArrayList<>(root.getChildren()); @@ -176,10 +176,12 @@ public class MainActivity extends AppCompatActivity } catch(Exception e) { Toast.makeText(MainActivity.this, "Ответ от сервера неверен! Перепроверьте данные подключения!", Toast.LENGTH_LONG).show(); Log.e("ERROR", "Answer of server is wrong! Re-check your connection credentials! Error: " + response.message()); + mSwipeRefreshLayout.setRefreshing(false); } fillRootNode(); } else { Log.e("ERROR", "Что-то пошло не так..."); + mSwipeRefreshLayout.setRefreshing(false); } } @@ -188,6 +190,7 @@ public class MainActivity extends AppCompatActivity public void onFailure(Call> call, Throwable t) { Toast.makeText(MainActivity.this, "Ошибка сети. Проверьте подключение к сети или данные подключения к API!", Toast.LENGTH_LONG).show(); Log.e("ERROR", "getFirstLevel() failed!"); + mSwipeRefreshLayout.setRefreshing(false); } }); }