diff --git a/app/src/main/java/com/cappielloantonio/tempo/database/dao/RecentSearchDao.java b/app/src/main/java/com/cappielloantonio/tempo/database/dao/RecentSearchDao.java index 38eb0f30..5041d912 100644 --- a/app/src/main/java/com/cappielloantonio/tempo/database/dao/RecentSearchDao.java +++ b/app/src/main/java/com/cappielloantonio/tempo/database/dao/RecentSearchDao.java @@ -12,8 +12,8 @@ import java.util.List; @Dao public interface RecentSearchDao { - @Query("SELECT * FROM recent_search GROUP BY search ORDER BY search DESC LIMIT :limit") - List getRecent(int limit); + @Query("SELECT * FROM recent_search ORDER BY search ASC") + List getRecent(); @Insert(onConflict = OnConflictStrategy.REPLACE) void insert(RecentSearch search); diff --git a/app/src/main/java/com/cappielloantonio/tempo/repository/SearchingRepository.java b/app/src/main/java/com/cappielloantonio/tempo/repository/SearchingRepository.java index 291e09bd..1a3c5f50 100644 --- a/app/src/main/java/com/cappielloantonio/tempo/repository/SearchingRepository.java +++ b/app/src/main/java/com/cappielloantonio/tempo/repository/SearchingRepository.java @@ -103,10 +103,10 @@ public class SearchingRepository { thread.start(); } - public List getRecentSearchSuggestion(int limit) { + public List getRecentSearchSuggestion() { List recent = new ArrayList<>(); - RecentThreadSafe suggestionsThread = new RecentThreadSafe(recentSearchDao, limit); + RecentThreadSafe suggestionsThread = new RecentThreadSafe(recentSearchDao); Thread thread = new Thread(suggestionsThread); thread.start(); @@ -152,17 +152,15 @@ public class SearchingRepository { private static class RecentThreadSafe implements Runnable { private final RecentSearchDao recentSearchDao; - private final int limit; private List recent = new ArrayList<>(); - public RecentThreadSafe(RecentSearchDao recentSearchDao, int limit) { + public RecentThreadSafe(RecentSearchDao recentSearchDao) { this.recentSearchDao = recentSearchDao; - this.limit = limit; } @Override public void run() { - recent = recentSearchDao.getRecent(limit); + recent = recentSearchDao.getRecent(); } public List getRecent() { diff --git a/app/src/main/java/com/cappielloantonio/tempo/viewmodel/SearchViewModel.java b/app/src/main/java/com/cappielloantonio/tempo/viewmodel/SearchViewModel.java index 8ac566d3..9e4175f0 100644 --- a/app/src/main/java/com/cappielloantonio/tempo/viewmodel/SearchViewModel.java +++ b/app/src/main/java/com/cappielloantonio/tempo/viewmodel/SearchViewModel.java @@ -56,7 +56,7 @@ public class SearchViewModel extends AndroidViewModel { public List getRecentSearchSuggestion() { ArrayList suggestions = new ArrayList<>(); - suggestions.addAll(searchingRepository.getRecentSearchSuggestion(5)); + suggestions.addAll(searchingRepository.getRecentSearchSuggestion()); return suggestions; }