From effa276c4ef0df81bd16f3cc79608a3b07237ad5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mart=C3=ADn=20Laiz=20G=C3=B3mez?= Date: Wed, 24 Jul 2019 22:18:19 +0200 Subject: [PATCH] Arreglado error mensajes sin tours y borrado de play caducado --- .../geofind/data/repository/PlayRepository.java | 5 +++-- .../geofind/views/fragment/MainFragment.java | 11 ++++++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/martinlaizg/geofind/data/repository/PlayRepository.java b/app/src/main/java/com/martinlaizg/geofind/data/repository/PlayRepository.java index b541c62..b3bca5a 100644 --- a/app/src/main/java/com/martinlaizg/geofind/data/repository/PlayRepository.java +++ b/app/src/main/java/com/martinlaizg/geofind/data/repository/PlayRepository.java @@ -170,9 +170,10 @@ public List getUserPlays(int user_id) throws APIException { if(plays.get(i).isOutOfDate()) { plays.remove(i); i--; + } else { + plays.get(i).setTour(tourRepo.getTour(plays.get(i).getTour_id())); + plays.get(i).setPlaces(placePlayDAO.getPlayPlace(plays.get(i).getId())); } - plays.get(i).setTour(tourRepo.getTour(plays.get(i).getTour_id())); - plays.get(i).setPlaces(placePlayDAO.getPlayPlace(plays.get(i).getId())); } } refreshUserPlays(user_id); diff --git a/app/src/main/java/com/martinlaizg/geofind/views/fragment/MainFragment.java b/app/src/main/java/com/martinlaizg/geofind/views/fragment/MainFragment.java index f581cab..a13f656 100644 --- a/app/src/main/java/com/martinlaizg/geofind/views/fragment/MainFragment.java +++ b/app/src/main/java/com/martinlaizg/geofind/views/fragment/MainFragment.java @@ -81,12 +81,13 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat } else { inProgress++; } - toursCompletedText.setText(getResources().getQuantityString( - R.plurals.you_complete_num_places, completed, completed)); - toursInProgressText.setText(getResources() - .getQuantityString(R.plurals.you_progress_tours, - inProgress, inProgress)); } + toursCompletedText.setText(getResources() + .getQuantityString(R.plurals.you_complete_num_places, + completed, completed)); + toursInProgressText.setText(getResources() + .getQuantityString(R.plurals.you_progress_tours, + inProgress, inProgress)); }); } }