Merge pull request #63 from martinlaizg/dev

Arreglado error mensajes sin tours y borrado de play caducado
martinlaizg · Jul 24, 2019 · be3a04b · be3a04b
2 parents 1971531 + effa276
commit be3a04b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 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
@@ -170,9 +170,10 @@ public List<Play> 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
@@ -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));
 		});
 	}
 }