diff --git a/store2store/src/main/java/com/playmoweb/store2store/dao/impl/RealmDao.java b/store2store/src/main/java/com/playmoweb/store2store/dao/impl/RealmDao.java index 6a4b59e..79694a6 100644 --- a/store2store/src/main/java/com/playmoweb/store2store/dao/impl/RealmDao.java +++ b/store2store/src/main/java/com/playmoweb/store2store/dao/impl/RealmDao.java @@ -39,8 +39,15 @@ public final Observable getOne(Filter filter, SortingMode sortingMode) { RealmQuery query = realm.where(clazz); query = filterToQuery(filter, query); - RealmResults items = query.findAllSorted(sortingMode.key, convertToSort(sortingMode.sort)); - T item = items.first(); + + T item; + + if(sortingMode != null) { + RealmResults items = query.findAllSorted(sortingMode.key, convertToSort(sortingMode.sort)); + item = items.first(); + } else { + item = query.findFirst(); + } T copy = null; if(item != null) { @@ -70,7 +77,13 @@ public final Observable> getAll(Filter filter, SortingMode sortingMode) Realm realm = Realm.getDefaultInstance(); RealmQuery query = realm.where(clazz); query = filterToQuery(filter, query); - RealmResults items = query.findAllSorted(sortingMode.key, convertToSort(sortingMode.sort)); + + RealmResults items; + if(sortingMode != null) { + items = query.findAllSorted(sortingMode.key, convertToSort(sortingMode.sort)); + } else { + items = query.findAll(); + } List copies = realm.copyFromRealm(items); realm.close();